incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject svn commit: r1354035 - in /incubator/ooo/trunk: ext_libraries/apr-util/ ext_libraries/apr/ ext_libraries/coinmp/ ext_libraries/serf/ ext_libraries/serf/prj/ main/ main/sccomp/source/solver/ main/scp2/prj/ main/scp2/source/calc/ main/scp2/source/ooo/ ma...
Date Tue, 26 Jun 2012 14:41:08 GMT
Author: af
Date: Tue Jun 26 14:41:05 2012
New Revision: 1354035

URL: http://svn.apache.org/viewvc?rev=1354035&view=rev
Log:
#i118906# Added --with-system-(apr,apr-util,serf,coinmp) switches to configure.
         
          Fixed by: Andre Fischer
          Patch by: Pedro Giffuni

Modified:
    incubator/ooo/trunk/ext_libraries/apr-util/makefile.mk
    incubator/ooo/trunk/ext_libraries/apr/makefile.mk
    incubator/ooo/trunk/ext_libraries/coinmp/makefile.mk
    incubator/ooo/trunk/ext_libraries/serf/makefile.mk
    incubator/ooo/trunk/ext_libraries/serf/prj/build.lst
    incubator/ooo/trunk/main/configure.in
    incubator/ooo/trunk/main/sccomp/source/solver/makefile.mk
    incubator/ooo/trunk/main/sccomp/source/solver/solver.cxx
    incubator/ooo/trunk/main/scp2/prj/build.lst
    incubator/ooo/trunk/main/scp2/source/calc/file_calc.scp
    incubator/ooo/trunk/main/scp2/source/calc/makefile.mk
    incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp
    incubator/ooo/trunk/main/scp2/source/ooo/makefile.mk
    incubator/ooo/trunk/main/scp2/source/ooo/shortcut_ooo.scp
    incubator/ooo/trunk/main/set_soenv.in
    incubator/ooo/trunk/main/solenv/inc/libs.mk
    incubator/ooo/trunk/main/ucb/prj/build.lst
    incubator/ooo/trunk/main/ucb/source/ucp/webdav/AprEnv.hxx
    incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfSession.cxx
    incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfUri.hxx
    incubator/ooo/trunk/main/ucb/source/ucp/webdav/makefile.mk

Modified: incubator/ooo/trunk/ext_libraries/apr-util/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/apr-util/makefile.mk?rev=1354035&r1=1354034&r2=1354035&view=diff
==============================================================================
--- incubator/ooo/trunk/ext_libraries/apr-util/makefile.mk (original)
+++ incubator/ooo/trunk/ext_libraries/apr-util/makefile.mk Tue Jun 26 14:41:05 2012
@@ -31,6 +31,13 @@ TARGET=aprutil
 
 # --- Files --------------------------------------------------------
 
+.IF "$(SYSTEM_APR_UTIL)"=="YES"
+
+all:
+	@echo "Using system apr-util.  Does not have to be built."
+
+.ELSE
+
 # Assemble the full version number from the parts defined in aprutil_version.mk
 APRUTIL_VERSION=$(APR_UTIL_MAJOR).$(APR_UTIL_MINOR).$(APR_UTIL_MICRO)
 
@@ -117,3 +124,4 @@ OUT2BIN=apu-1-config
 .INCLUDE : target.mk
 .INCLUDE : tg_ext.mk
 
+.ENDIF

Modified: incubator/ooo/trunk/ext_libraries/apr/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/apr/makefile.mk?rev=1354035&r1=1354034&r2=1354035&view=diff
==============================================================================
--- incubator/ooo/trunk/ext_libraries/apr/makefile.mk (original)
+++ incubator/ooo/trunk/ext_libraries/apr/makefile.mk Tue Jun 26 14:41:05 2012
@@ -31,6 +31,13 @@ TARGET=apr
 
 # --- Files --------------------------------------------------------
 
+.IF "$(SYSTEM_APR)"=="YES"
+
+all:
+	@echo "Using system apr.  Does not have to be built."
+
+.ELSE
+
 # Assemble the full version number from the parts defined in apr_version.mk
 APRVERSION=$(APR_MAJOR).$(APR_MINOR).$(APR_MICRO)
 
@@ -100,3 +107,5 @@ OUT2BIN+=apr-1-config
 .INCLUDE : set_ext.mk
 .INCLUDE : target.mk
 .INCLUDE : tg_ext.mk
+
+.ENDIF

Modified: incubator/ooo/trunk/ext_libraries/coinmp/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/coinmp/makefile.mk?rev=1354035&r1=1354034&r2=1354035&view=diff
==============================================================================
--- incubator/ooo/trunk/ext_libraries/coinmp/makefile.mk (original)
+++ incubator/ooo/trunk/ext_libraries/coinmp/makefile.mk Tue Jun 26 14:41:05 2012
@@ -35,6 +35,11 @@ TARGET=coinmp
 all:
 	@echo "CoinMP is disabled and will not be built."
 
+.ELIF "$(SYSTEM_COINMP)"=="YES"
+
+all:
+	@echo "Using system CoinMP.  Does not have to be built."
+
 .ELSE
 
 TARFILE_NAME=CoinMP-1.6.0

Modified: incubator/ooo/trunk/ext_libraries/serf/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/serf/makefile.mk?rev=1354035&r1=1354034&r2=1354035&view=diff
==============================================================================
--- incubator/ooo/trunk/ext_libraries/serf/makefile.mk (original)
+++ incubator/ooo/trunk/ext_libraries/serf/makefile.mk Tue Jun 26 14:41:05 2012
@@ -31,6 +31,13 @@ TARGET=so_serf
 
 # --- Files --------------------------------------------------------
 
+.IF "$(SYSTEM_SERF)"=="YES"
+
+all:
+	@echo "Using system serf.  Does not have to be built."
+
+.ELSE
+
 # Assemble the full version number from the parts defined in serf_version.mk
 LIBSERFVERSION=$(SERF_MAJOR).$(SERF_MINOR).$(SERF_MICRO)
 
@@ -117,3 +124,5 @@ OUT2LIB=.libs/libserf-1.so*
 .INCLUDE : set_ext.mk
 .INCLUDE : target.mk
 .INCLUDE : tg_ext.mk
+
+.ENDIF

Modified: incubator/ooo/trunk/ext_libraries/serf/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/serf/prj/build.lst?rev=1354035&r1=1354034&r2=1354035&view=diff
==============================================================================
--- incubator/ooo/trunk/ext_libraries/serf/prj/build.lst (original)
+++ incubator/ooo/trunk/ext_libraries/serf/prj/build.lst Tue Jun 26 14:41:05 2012
@@ -1,3 +1,3 @@
-serf     serf :  apr-util OPENSSL:openssl NULL	
+serf     serf :  APR_UTIL:apr-util OPENSSL:openssl NULL	
 serf     serf usr1    -	all	serf_mkout NULL
 serf     serf nmake	-	all	serf_serf NULL

Modified: incubator/ooo/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configure.in?rev=1354035&r1=1354034&r2=1354035&view=diff
==============================================================================
--- incubator/ooo/trunk/main/configure.in (original)
+++ incubator/ooo/trunk/main/configure.in Tue Jun 26 14:41:05 2012
@@ -771,6 +771,18 @@ AC_ARG_WITH(local-solver,
 AC_ARG_ENABLE(javascript,
 [  --disable-javascript    Disables support for JavaScript macros.
 ],,)
+AC_ARG_WITH(system-apr,
+[  --with-system-apr       Use apr library already installed on the system
+],,)
+AC_ARG_WITH(system-apr-util,
+[  --with-system-apr-util  Use apr-util library already installed on the system
+],,)
+AC_ARG_WITH(system-serf,
+[  --with-system-serf      Use serf library already installed on the system
+],,)
+AC_ARG_WITH(system-coinmp,
+[  --with-system-coinmp    Use CoinMP library already installed on the system
+],,)
 AC_ARG_ENABLE(coinmp,
 [  --disable-coinmp        Do not use CoinMP as the Calc solver.
 ],,)
@@ -4442,19 +4454,103 @@ AC_SUBST(ENABLE_JAVASCRIPT)
 
 
 dnl ===================================================================
+dnl Check for system apr
+dnl ===================================================================
+SYSTEM_APR=NO
+APR_CFLAGS=
+APR_LIBS=
+AC_MSG_CHECKING([which libapr to use])
+if test "x$with_system_apr" = "xyes" -o -n "$with_system_libs"; then
+    AC_MSG_RESULT([system])
+    PKG_CHECK_MODULES([APR], [apr-1 >= 1.0])
+    SYSTEM_APR=YES
+else
+    AC_MSG_RESULT([internal])
+    SYSTEM_APR=NO
+    BUILD_TYPE="$BUILD_TYPE APR"
+fi
+AC_SUBST(SYSTEM_APR)
+AC_SUBST(APR_CFLAGS)
+AC_SUBST(APR_LIBS)
+
+
+dnl ===================================================================
+dnl Check for system apr-util
+dnl ===================================================================
+SYSTEM_APRUTIL=NO
+APRUTIL_CFLAGS=
+APRUTIL_LIBS=
+AC_MSG_CHECKING([which libapr-util to use])
+if test "x$with_system_apr_util" = "xyes" -o -n "$with_system_libs"; then
+    AC_MSG_RESULT([system])
+    PKG_CHECK_MODULES([APRUTIL], [apr-util-1 >= 1.0])
+    SYSTEM_APRUTIL=YES
+else
+    AC_MSG_RESULT([internal])
+    SYSTEMAPR_UTIL=NO
+    BUILD_TYPE="$BUILD_TYPE APR_UTIL"
+fi
+AC_SUBST(SYSTEM_APRUTIL)
+AC_SUBST(APRUTIL_CFLAGS)
+AC_SUBST(APRUTIL_LIBS)
+
+
+dnl ===================================================================
+dnl Check for system serf
+dnl ===================================================================
+SYSTEM_SERF=NO
+SERF_CFLAGS=
+SERF_LIBS=
+AC_MSG_CHECKING([which libserf to use])
+if test "x$with_system_serf" = "xyes" -o -n "$with_system_libs"; then
+    AC_MSG_RESULT([system])
+    PKG_CHECK_MODULES([SERF], [serf-1 >= 1.1])
+    SYSTEM_SERF=YES
+else
+    AC_MSG_RESULT([internal])
+    SYSTEM_SERF=NO
+    BUILD_TYPE="$BUILD_TYPE SERF"
+fi
+AC_SUBST(SYSTEM_SERF)
+AC_SUBST(SERF_CFLAGS)
+AC_SUBST(SERF_LIBS)
+
+
+dnl ===================================================================
 dnl Check for CoinMP
 dnl ===================================================================
 ENABLE_COINMP=
+SYSTEM_COINMP=NO
+COINMP_CFLAGS=
+COINMP_LIBS=
 AC_MSG_CHECKING([whether to enable support for CoinMP])
 if test "x$enable_coinmp" = "xyes"; then
-   BUILD_TYPE="$BUILD_TYPE COINMP"
-   AC_MSG_RESULT([yes])
-   ENABLE_COINMP=YES
+    BUILD_TYPE="$BUILD_TYPE COINMP"
+    AC_MSG_RESULT([yes])
+    ENABLE_COINMP=YES
+
+    dnl Check wether to use system or internal CoinMP
+    AC_MSG_CHECKING([which coinmp to use])
+    if test "x$with_system_coinmp" = "xyes" -o -n "$with_system_libs"; then
+        AC_MSG_RESULT([system])
+	PKG_CHECK_MODULES([COINMP], [coinmp])
+        SYSTEM_COINMP=YES
+        # some systems need this. Like Ubuntu....
+        AC_CHECK_LIB(m, floor)
+        AC_CHECK_LIB(dl, dlopen)
+    else
+        AC_MSG_RESULT([internal])
+        SYSTEM_COINMP=NO
+        BUILD_TYPE="$BUILD_TYPE COINMP"
+    fi
 else
-   AC_MSG_RESULT([no])
-   ENABLE_COINMP=NO
+    AC_MSG_RESULT([no])
+    ENABLE_COINMP=NO
 fi
 AC_SUBST(ENABLE_COINMP)
+AC_SUBST(SYSTEM_COINMP)
+AC_SUBST(COINMP_CFLAGS)
+AC_SUBST(COINMP_LIBS)
 
 
 dnl ===================================================================

Modified: incubator/ooo/trunk/main/sccomp/source/solver/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sccomp/source/solver/makefile.mk?rev=1354035&r1=1354034&r2=1354035&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sccomp/source/solver/makefile.mk (original)
+++ incubator/ooo/trunk/main/sccomp/source/solver/makefile.mk Tue Jun 26 14:41:05 2012
@@ -58,14 +58,22 @@ SHL1STDLIBS=    $(COMPHELPERLIB)    \
                 $(CPPUHELPERLIB)    \
                 $(CPPULIB)          \
                 $(SALLIB)           \
-                $(TOOLSLIB)         \
-                $(COINMPLIBS)
+                $(TOOLSLIB)
 
 SHL1DEPN=       makefile.mk
 SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
 SHL1VERSIONMAP= $(SOLARENV)/src/component.map
 DEF1NAME=       $(SHL1TARGET)
 
+.IF "$(SYSTEM_COINMP)" == "YES"
+CFLAGS+= $(COINMP_CFLAGS) -DSYSTEM_COINMP
+# Use the library flags from configure
+SHL1STDLIBS+=$(COINMP_LIBS)
+.ELSE
+# Use the library flags from solenv
+SHL1STDLIBS+=$(COINMPLIBS)
+.ENDIF
+
 # --- Resources --------------------------------
 
 RESLIB1LIST=$(SRS)$/solver.srs

Modified: incubator/ooo/trunk/main/sccomp/source/solver/solver.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sccomp/source/solver/solver.cxx?rev=1354035&r1=1354034&r2=1354035&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sccomp/source/solver/solver.cxx (original)
+++ incubator/ooo/trunk/main/sccomp/source/solver/solver.cxx Tue Jun 26 14:41:05 2012
@@ -20,8 +20,11 @@
  *************************************************************/
 
 
-
+#ifdef SYSTEM_COINMP
+#include <coin/CoinMP.h>
+#else
 #include <coinmp/CoinMP.h>
+#endif
 
 #include "solver.hxx"
 #include "solver.hrc"

Modified: incubator/ooo/trunk/main/scp2/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/prj/build.lst?rev=1354035&r1=1354034&r2=1354035&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/prj/build.lst (original)
+++ incubator/ooo/trunk/main/scp2/prj/build.lst Tue Jun 26 14:41:05 2012
@@ -1,4 +1,4 @@
-cp    scp2    :    L10N:l10n i18npool setup_native l10ntools PYTHON:python ICU:icu REDLAND:redland
LIBXSLT:libxslt serf NULL
+cp    scp2    :    L10N:l10n i18npool setup_native l10ntools PYTHON:python ICU:icu REDLAND:redland
LIBXSLT:libxslt APR:apr APR_UTIL:apr-util SERF:serf NULL
 cp    scp2                        usr1     -    all    cp_mkout NULL
 cp    scp2\macros                 nmake    -    all    cp_langmacros NULL
 cp    scp2\source\templates       nmake    -    all    cp_langtemplates NULL

Modified: incubator/ooo/trunk/main/scp2/source/calc/file_calc.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/calc/file_calc.scp?rev=1354035&r1=1354034&r2=1354035&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/calc/file_calc.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/calc/file_calc.scp Tue Jun 26 14:41:05 2012
@@ -64,7 +64,9 @@ File gid_File_Lib_CbcSolver
     Name = SPECIAL_NAME_VER(CbcSolver,3);
     PACKED_LIB_FILE_BODY;
 End
-#else
+#endif
+
+#ifdef ADD_MAIN_COINMP_LIBRARY
 // On Windows only the CoinMP library is built and used.
 // Version numbering is not used either.
 File gid_File_Lib_CoinMP

Modified: incubator/ooo/trunk/main/scp2/source/calc/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/calc/makefile.mk?rev=1354035&r1=1354034&r2=1354035&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/calc/makefile.mk (original)
+++ incubator/ooo/trunk/main/scp2/source/calc/makefile.mk Tue Jun 26 14:41:05 2012
@@ -35,10 +35,14 @@ TARGETTYPE=CUI
 
 .IF "$(ENABLE_COINMP)" == "YES"
 SCPDEFS+=-DENABLE_COINMP
+.IF "$(SYSTEM_COINMP)" == "NO"
 .IF "$(GUI)"!="WNT"
 # For the non-Windows platforms all libraries related to CoinMP have to be
 # added explicitly.
 SCPDEFS+=-DADD_ALL_COINMP_LIBRARIES
+.ELSE
+SCPDEFS+=-DADD_MAIN_COINMP_LIBRARY
+.ENDIF
 .ENDIF
 .ENDIF
 

Modified: incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp?rev=1354035&r1=1354034&r2=1354035&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp Tue Jun 26 14:41:05 2012
@@ -2002,8 +2002,10 @@ End
 #endif
 #endif
 
+// AF: is this still needed with explicit support for system apr,apr-util,serf ?
 #if !defined(OS2) // using system libs
 
+#ifdef APR_MAJOR 
 File gid_File_Lib_Apr
      #ifdef WNT
         Name = SPECIAL_NAME(libapr-1);
@@ -2020,7 +2022,9 @@ File gid_File_Lib_Apr
      #endif
      PACKED_LIB_FILE_BODY;
 End
+#endif
 
+#ifdef APR_UTIL_MAJOR
 File gid_File_Lib_AprUtil
     #ifdef WNT
         Name = SPECIAL_NAME(apr-util);
@@ -2037,7 +2041,9 @@ File gid_File_Lib_AprUtil
     #endif
     PACKED_LIB_FILE_BODY;
 End
+#endif
 
+#ifdef SERF_MAJOR
 File gid_File_Lib_Serf
     #ifdef WNT
         Name = SPECIAL_NAME(serf);
@@ -2054,5 +2060,6 @@ File gid_File_Lib_Serf
     #endif
     PACKED_LIB_FILE_BODY;
 End
+#endif
 
 #endif // !defined(OS2)

Modified: incubator/ooo/trunk/main/scp2/source/ooo/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/makefile.mk?rev=1354035&r1=1354034&r2=1354035&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/makefile.mk (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/makefile.mk Tue Jun 26 14:41:05 2012
@@ -241,19 +241,27 @@ SCPDEFS+=-DDISABLE_ATL
 .ENDIF
 
 # Detect version numbers for apr, apr-util, serf.
+.IF "$(SYSTEM_APR)"!="YES"
 .INCLUDE : apr_version.mk
-.INCLUDE : aprutil_version.mk
-.INCLUDE : serf_version.mk
 SCPDEFS+=\
     -DAPR_MAJOR=$(APR_MAJOR)		\
     -DAPR_MINOR=$(APR_MINOR)		\
-    -DAPR_MICRO=$(APR_MICRO)		\
+    -DAPR_MICRO=$(APR_MICRO)
+.ENDIF
+.IF "$(SYSTEM_APR_UTIL)"!="YES"
+.INCLUDE : aprutil_version.mk
+SCPDEFS+=\
     -DAPR_UTIL_MAJOR=$(APR_UTIL_MAJOR)	\
     -DAPR_UTIL_MINOR=$(APR_UTIL_MINOR)	\
-    -DAPR_UTIL_MICRO=$(APR_UTIL_MICRO)	\
+    -DAPR_UTIL_MICRO=$(APR_UTIL_MICRO)
+.ENDIF
+.IF "$(SYSTEM_SERF)"!="YES"
+.INCLUDE : serf_version.mk
+SCPDEFS+=\
     -DSERF_MAJOR=$(SERF_MAJOR)		\
     -DSERF_MINOR=$(SERF_MINOR)		\
     -DSERF_MICRO=$(SERF_MICRO)
+.ENDIF
 
 .IF "$(SYSTEM_PYTHON)" == "YES"
 SCPDEFS+=-DSYSTEM_PYTHON

Modified: incubator/ooo/trunk/main/scp2/source/ooo/shortcut_ooo.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/shortcut_ooo.scp?rev=1354035&r1=1354034&r2=1354035&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/shortcut_ooo.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/shortcut_ooo.scp Tue Jun 26 14:41:05 2012
@@ -96,6 +96,7 @@ End
 // The major version number is handled in a non-standard way (part of the name).
 // Therefore the hard-coded .0 suffix.
 
+#ifdef APR_MAJOR 
 Shortcut gid_Shortcut_Lib_Apr
     FileID = gid_File_Lib_Apr;
     Dir = SCP2_OOO_BIN_DIR;
@@ -106,7 +107,9 @@ Shortcut gid_Shortcut_Lib_Apr
     #endif
     Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
 End
+#endif
 
+#ifdef APR_UTIL_MAJOR
 Shortcut gid_Shortcut_Lib_AprUtil
     FileID = gid_File_Lib_AprUtil;
     Dir = SCP2_OOO_BIN_DIR;
@@ -117,7 +120,9 @@ Shortcut gid_Shortcut_Lib_AprUtil
     #endif
     Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
 End
+#endif
 
+#ifdef SERF_MAJOR
 Shortcut gid_Shortcut_Lib_Serf
     FileID = gid_File_Lib_Serf;
     Dir = SCP2_OOO_BIN_DIR;
@@ -128,6 +133,7 @@ Shortcut gid_Shortcut_Lib_Serf
     #endif
     Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
 End
+#endif
 
 #endif
 

Modified: incubator/ooo/trunk/main/set_soenv.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/set_soenv.in?rev=1354035&r1=1354034&r2=1354035&view=diff
==============================================================================
--- incubator/ooo/trunk/main/set_soenv.in (original)
+++ incubator/ooo/trunk/main/set_soenv.in Tue Jun 26 14:41:05 2012
@@ -1985,7 +1985,19 @@ ToFile( "SYSTEM_SAXON",      "@SYSTEM_SA
 ToFile( "SAXON_JAR",         "@SAXON_JAR@",        "e" );
 ToFile( "DISABLE_SAXON",     "@DISABLE_SAXON@",    "e" );
 ToFile( "ENABLE_JAVASCRIPT", "@ENABLE_JAVASCRIPT@","e" );
+ToFile( "SYSTEM_APR",        "@SYSTEM_APR@",       "e" );
+ToFile( "APR_CFLAGS",        "@APR_CFLAGS@",       "e" );
+ToFile( "APR_LIBS",          "@APR_LIBS@",         "e" );
+ToFile( "SYSTEM_APRUTIL",    "@SYSTEM_APRUTIL@",   "e" );
+ToFile( "APRUTIL_CFLAGS",    "@APRUTIL_CFLAGS@",   "e" );
+ToFile( "APRUTIL_LIBS",      "@APRUTIL_LIBS@",     "e" );
+ToFile( "SYSTEM_SERF",       "@SYSTEM_SERF@",      "e" );
+ToFile( "SERF_CFLAGS",       "@SERF_CFLAGS@",      "e" );
+ToFile( "SERF_LIBS",         "@SERF_LIBS@",        "e" );
+ToFile( "SYSTEM_COINMP",     "@SYSTEM_COINMP@",    "e" );
 ToFile( "ENABLE_COINMP",     "@ENABLE_COINMP@",    "e" );
+ToFile( "COINMP_CFLAGS",     "@COINMP_CFLAGS@",    "e" );
+ToFile( "COINMP_LIBS",       "@COINMP_LIBS@",      "e" );
 ToFile( "SYSTEM_ODBC_HEADERS","@SYSTEM_ODBC_HEADERS@","e" );
 ToFile( "SYSTEM_LIBXSLT",    "@SYSTEM_LIBXSLT@",   "e" );
 ToFile( "LIBXSLT_CFLAGS",    "@LIBXSLT_CFLAGS@",   "e" );

Modified: incubator/ooo/trunk/main/solenv/inc/libs.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/libs.mk?rev=1354035&r1=1354034&r2=1354035&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/inc/libs.mk (original)
+++ incubator/ooo/trunk/main/solenv/inc/libs.mk Tue Jun 26 14:41:05 2012
@@ -355,7 +355,9 @@ MYTHESLIB=-lmythes-1.2
 .ENDIF
 PYUNOLIB=-lpyuno
 COINMPLIBS=-lCoinMP -lCoinUtils -lClp -lCbc -lOsi -lOsiClp -lCgl -lCbcSolver
-SERFLIBS=-lapr-1 -laprutil-1 -lserf-1
+INTERNAL_APR_LIBS=-lapr-1
+INTERNAL_APRUTIL_LIBS=-laprutil-1
+INTERNAL_SERF_LIBS=-lserf-1
 SOFFICELIB=-lsofficeapp
 UNOPKGAPPLIB=-lunopkgapp
 TESTLIB=-ltest
@@ -526,7 +528,9 @@ HUNSPELLLIB=$(LIBPRE) libhunspell.lib
 MYTHESLIB=libmythes.lib
 PYUNOLIB=ipyuno.lib
 COINMPLIBS=CoinMP.lib
-SERFLIBS=libapr-1.lib iapr-util.lib iserf.lib
+INTERNAL_APR_LIBS=libapr-1.lib
+INTERNAL_APRUTIL_LIBS=iapr-util.lib
+INTERNAL_SERF_LIBS=iserf.lib
 SOFFICELIB=isofficeapp.lib
 UNOPKGAPPLIB=iunopkgapp.lib
 TESTLIB=itest.lib

Modified: incubator/ooo/trunk/main/ucb/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/prj/build.lst?rev=1354035&r1=1354034&r2=1354035&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/prj/build.lst (original)
+++ incubator/ooo/trunk/main/ucb/prj/build.lst Tue Jun 26 14:41:05 2012
@@ -1,4 +1,4 @@
-uc ucb : cppuhelper CURL:curl OPENSSL:openssl LIBXML2:libxml2 LIBXSLT:libxslt offapi sal
salhelper ucbhelper udkapi comphelper serf tools NULL
+uc ucb : cppuhelper CURL:curl OPENSSL:openssl LIBXML2:libxml2 LIBXSLT:libxslt offapi sal
salhelper ucbhelper udkapi comphelper SERF:serf tools NULL
 uc	ucb							usr1	-	all	uc_mkout NULL
 uc	ucb\inc					    nmake	-	all	uc_inc NULL
 uc	ucb\source\regexp		    nmake	-	all	uc_regexp uc_inc NULL

Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/AprEnv.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/AprEnv.hxx?rev=1354035&r1=1354034&r2=1354035&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/AprEnv.hxx (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/AprEnv.hxx Tue Jun 26 14:41:05 2012
@@ -23,11 +23,7 @@
 #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
 {

Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfSession.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfSession.cxx?rev=1354035&r1=1354034&r2=1354035&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfSession.cxx (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfSession.cxx Tue Jun 26 14:41:05 2012
@@ -162,7 +162,7 @@ void SerfSession::Init()
         if ( m_aProxyName.getLength() )
         {
             apr_sockaddr_t *proxy_address = NULL;
-            const apr_status_t status = apr_sockaddr_info_get( &proxy_address, 
+            status = apr_sockaddr_info_get( &proxy_address, 
                                                                rtl::OUStringToOString( m_aProxyName,
RTL_TEXTENCODING_UTF8 ), 
                                                                APR_UNSPEC,
                                                                static_cast<apr_port_t>(m_nProxyPort),

@@ -460,7 +460,7 @@ apr_status_t SerfSession::verifySerfCert
     // done outside the isDomainMatch() block because the result is
     // used by the interaction handler.
     std::vector< uno::Reference< security::XCertificate > > aChain;
-    for (int nIndex=1; nIndex<nCertificateChainLength; ++nIndex)
+    for (nIndex=1; nIndex<nCertificateChainLength; ++nIndex)
     {
         const char* sBase64EncodedCertificate (
             serf_ssl_cert_export(

Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfUri.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfUri.hxx?rev=1354035&r1=1354034&r2=1354035&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfUri.hxx (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfUri.hxx Tue Jun 26 14:41:05 2012
@@ -23,11 +23,7 @@
 #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>
 

Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/makefile.mk?rev=1354035&r1=1354034&r2=1354035&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/makefile.mk (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/makefile.mk Tue Jun 26 14:41:05 2012
@@ -48,18 +48,6 @@ APRINCDIR=apr
 APRUTILINCDIR=apr-util
 SERFINCDIR=serf
 
-#.IF "$(SYSTEM_APR)" != "YES"
-#.INCLUDE: $(SOLARINCDIR)$/$(APRINCDIR)$/version.mk
-#.ENDIF
-#.IF "$(SYSTEM_APRUTIL)" != "YES"
-#.INCLUDE: $(SOLARINCDIR)$/$(APRUTILINCDIR)$/version.mk
-#.ENDIF
-#.IF "$(SYSTEM_SERF)" != "YES"
-#.INCLUDE: $(SOLARINCDIR)$/$(SERFINCDIR)$/version.mk
-#.ENDIF
-
-#CFLAGS+= -DAPR_VERSION=0x$(APR_VERSION) -DAPRUTIL_VERSION=0x$(APRUTIL_VERSION) -DSERF_VERSION=0x$(SERF_VERSION)
-
 #
 # Extend the list of include paths depending on whether we use locally built
 # or system versions of libraries apr, apr-util, serf, libxml
@@ -69,20 +57,26 @@ SERFINCDIR=serf
 
 .IF "$(SYSTEM_APR)" == "YES"
 CFLAGS+= $(APR_CFLAGS)
+SHL1STDLIBS+=$(APR_LIBS)
 .ELSE
 CFLAGS+= -I$(SOLARINCDIR)$/$(APRINCDIR)
+SHL1STDLIBS+=$(INTERNAL_APR_LIBS)
 .ENDIF
 
 .IF "$(SYSTEM_APRUTIL)" == "YES"
 CFLAGS+= $(APRUTIL_CFLAGS)
+SHL1STDLIBS+=$(APRUTIL_LIBS)
 .ELSE
 CFLAGS+= -I$(SOLARINCDIR)$/$(APRUTILINCDIR)
+SHL1STDLIBS+=$(INTERNAL_APRUTIL_LIBS)
 .ENDIF
 
 .IF "$(SYSTEM_SERF)" == "YES"
 CFLAGS+= $(SERF_CFLAGS)
+SHL1STDLIBS+=$(SERF_LIBS)
 .ELSE
 CFLAGS+= -I$(SOLARINCDIR)$/$(SERFINCDIR)
+SHL1STDLIBS+=$(INTERNAL_SERF_LIBS)
 .ENDIF
 
 .IF "$(SYSTEM_LIBXML)" == "YES"
@@ -94,6 +88,9 @@ CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXMLINCDI
 
 .IF "$(SYSTEM_OPENSSL)" == "YES"
 CFLAGS+= -I$(OPENSSL_CFLAGS)
+SHL1STDLIBS+= $(OPENSSLLIB)
+.ELSE
+SHL1STDLIBS+= $(OPENSSLLIBST)
 .ENDIF
 
 # --- General -----------------------------------------------------
@@ -141,14 +138,13 @@ SHL1IMPLIB=i$(TARGET)
 
 SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
-SHL1STDLIBS=\
+SHL1STDLIBS+=\
         $(CPPUHELPERLIB) \
         $(CPPULIB)       \
         $(SALLIB)        \
         $(SALHELPERLIB)  \
         $(UCBHELPERLIB)  \
         $(COMPHELPERLIB) \
-		$(SERFLIBS)      \
         $(LIBXML2LIB)
 
 .IF "$(GUI)"=="WNT"
@@ -156,16 +152,10 @@ SHL1STDLIBS+= $(WSOCK32LIB)
 .IF "$(WINDOWS_VISTA_PSDK)" != ""
 SHL1STDLIBS+= $(WS2_32LIB)
 .ENDIF
-SHL1STDLIBS+= $(OPENSSLLIB)
 .ELSE # WNT
 .IF "$(OS)"=="SOLARIS"
 SHL1STDLIBS+= -lnsl -lsocket -ldl
 .ENDIF # SOLARIS
-.IF "$(SYSTEM_OPENSSL)"=="YES"
-SHL1STDLIBS+= $(OPENSSLLIB)
-.ELSE
-SHL1STDLIBS+= $(OPENSSLLIBST)
-.ENDIF
 .ENDIF # WNT
 
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def



Mime
View raw message