incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arie...@apache.org
Subject svn commit: r1341712 - in /incubator/ooo/trunk/ext_libraries/serf: makefile.mk prj/build.lst
Date Wed, 23 May 2012 01:30:31 GMT
Author: arielch
Date: Wed May 23 01:30:31 2012
New Revision: 1341712

URL: http://svn.apache.org/viewvc?rev=1341712&view=rev
Log:
Fix OpenSSL dependency in serf

Modified:
    incubator/ooo/trunk/ext_libraries/serf/makefile.mk
    incubator/ooo/trunk/ext_libraries/serf/prj/build.lst

Modified: incubator/ooo/trunk/ext_libraries/serf/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/serf/makefile.mk?rev=1341712&r1=1341711&r2=1341712&view=diff
==============================================================================
--- incubator/ooo/trunk/ext_libraries/serf/makefile.mk (original)
+++ incubator/ooo/trunk/ext_libraries/serf/makefile.mk Wed May 23 01:30:31 2012
@@ -79,8 +79,17 @@ PATCH_FILES+=$(TARFILE_NAME).ldl.patch
 
 CONFIGURE_DIR=
 CONFIGURE_ACTION=autoconf && .$/configure
-.IF "$(OS)"=="MACOSX"
-# On Mac we need the content of CDEFS in CFLAGS so that the ssl headers are searched for

+
+.IF "$(OS)"=="MACOSX" || "$(OS)"=="LINUX"
+.IF "$(OS)"=="LINUX"
+.IF "$(SYSTEM_OPENSSL)"=="YES"
+CDEFS+=$(OPENSSL_CFLAGS)
+.ELSE
+OPENSSLINCDIR=external
+CDEFS+=-I$(SOLARINCDIR)$/$(OPENSSLINCDIR)
+.ENDIF
+.ENDIF
+# On Linux/Mac we need the content of CDEFS in CFLAGS so that the ssl headers are searched
for
 # in a directory that corresponds to the directory that is searched for the ssl library.
 CONFIGURE_FLAGS='CFLAGS=$(CDEFS)'
 .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=1341712&r1=1341711&r2=1341712&view=diff
==============================================================================
--- incubator/ooo/trunk/ext_libraries/serf/prj/build.lst (original)
+++ incubator/ooo/trunk/ext_libraries/serf/prj/build.lst Wed May 23 01:30:31 2012
@@ -1,3 +1,3 @@
-serf     serf :  apr-util NULL	
+serf     serf :  apr-util OPENSSL:openssl NULL	
 serf     serf usr1    -	all	serf_mkout NULL
 serf     serf nmake	-	all	serf_serf NULL



Mime
View raw message