Author: arielch
Date: Wed May 23 01:30:38 2012
New Revision: 1341713
URL: http://svn.apache.org/viewvc?rev=1341713&view=rev
Log:
Do not link serf against expat on Linux
Modified:
incubator/ooo/trunk/ext_libraries/serf/makefile.mk
Modified: incubator/ooo/trunk/ext_libraries/serf/makefile.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/serf/makefile.mk?rev=1341713&r1=1341712&r2=1341713&view=diff
==============================================================================
--- incubator/ooo/trunk/ext_libraries/serf/makefile.mk (original)
+++ incubator/ooo/trunk/ext_libraries/serf/makefile.mk Wed May 23 01:30:38 2012
@@ -68,11 +68,13 @@ BUILD_FLAGS+= -j$(EXTMAXPROCESS)
.ELSE
-.IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
+.IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD" || "$(OS)"=="LINUX"
# Do not link against expat. It is not necessary (apr-util is already linked
against it)
# and does not work (we use a different expat library schema.)
PATCH_FILES+=$(TARFILE_NAME).mac.patch
-.ELSE
+.ENDIF
+
+.IF "$(OS)"=="LINUX"
# Add -ldl as last library so that the linker has no trouble resolving
dependencies.
PATCH_FILES+=$(TARFILE_NAME).ldl.patch
.ENDIF
