Author: arielch
Date: Thu Jun 6 06:53:38 2013
New Revision: 1490174
URL: http://svn.apache.org/r1490174
Log:
i122486 - Use internal expat on Linux
Added:
openoffice/trunk/ext_libraries/apr-util/apr-util-1.4.1.expat.patch
(contents, props changed)
- copied, changed from r1490123,
openoffice/trunk/ext_libraries/apr-util/apr-util-1.4.1.mac.expat.patch
Removed:
openoffice/trunk/ext_libraries/apr-util/apr-util-1.4.1.mac.expat.patch
Modified:
openoffice/trunk/ext_libraries/apr-util/makefile.mk
Copied: openoffice/trunk/ext_libraries/apr-util/apr-util-1.4.1.expat.patch
(from r1490123,
openoffice/trunk/ext_libraries/apr-util/apr-util-1.4.1.mac.expat.patch)
URL:
http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/apr-util/apr-util-1.4.1.expat.patch?p2=openoffice/trunk/ext_libraries/apr-util/apr-util-1.4.1.expat.patch&p1=openoffice/trunk/ext_libraries/apr-util/apr-util-1.4.1.mac.expat.patch&r1=1490123&r2=1490174&rev=1490174&view=diff
==============================================================================
(empty)
Propchange: openoffice/trunk/ext_libraries/apr-util/apr-util-1.4.1.expat.patch
------------------------------------------------------------------------------
svn:eol-style = native
Modified: openoffice/trunk/ext_libraries/apr-util/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/apr-util/makefile.mk?rev=1490174&r1=1490173&r2=1490174&view=diff
==============================================================================
--- openoffice/trunk/ext_libraries/apr-util/makefile.mk (original)
+++ openoffice/trunk/ext_libraries/apr-util/makefile.mk Thu Jun 6 06:53:38 2013
@@ -83,13 +83,13 @@ CONFIGURE_FLAGS=
\
--with-iconv="no"
-# Use our own expat on the Mac. Maybe we should do this on Linux, too?
-.IF "$(OS)" == "MACOSX"
+# Use our own expat on the Mac. Maybe we should do this on Linux, too? Yes!
+.IF "$(OS)" == "MACOSX" || ("$(OS)" == "LINUX" && "$(SYSTEM_EXPAT)"!="YES")
CONFIGURE_FLAGS+= --with-expat=$(OUTDIR)
# The non-standard names of our expat libraries (yes, plural) make
# a special handling in apr-utils configure necessary.
-PATCH_FILES+= $(TARFILE_NAME).mac.expat.patch
+PATCH_FILES+= $(TARFILE_NAME).expat.patch
.ENDIF
