i118923 - OS/2 port: use system libraries for apr, apr-util, serf.

scp2/source/ooo/file_library_ooo.scp

@@ -1998,6 +1998,8 @@ End
 #endif
 #endif
 
+#if !defined(OS2) // using system libs
+
 File gid_File_Lib_Apr
      #ifdef WNT
         Name = SPECIAL_NAME(libapr-1);
@@ -2043,3 +2045,4 @@ File gid_File_Lib_Serf
     PACKED_LIB_FILE_BODY;
 End
 
+#endif // !defined(OS2)

ucb/source/ucp/webdav/AprEnv.hxx

@@ -23,7 +23,11 @@
 #ifndef INCLUDED_APRENV_HXX
 #define INCLUDED_APRENV_HXX
 
+#ifdef OS2 // use system apr headers
+#include <apr_pools.h>
+#else
 #include <apr/apr_pools.h>
+#endif
 
 namespace apr_environment
 {

ucb/source/ucp/webdav/SerfUri.hxx

@@ -23,7 +23,11 @@
 #ifndef INCLUDED_SERFURI_HXX
 #define INCLUDED_SERFURI_HXX
 
+#ifdef OS2 // use system apr headers
+#include <apr_uri.h>
+#else
 #include <apr-util/apr_uri.h>
+#endif
 #include <rtl/ustring.hxx>
 #include <DAVException.hxx>