incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject svn commit: r1293126 - /incubator/ooo/trunk/ext_libraries/apr-util/apr-util-1.4.1.mac.expat.patch
Date Fri, 24 Feb 2012 08:14:11 GMT
Author: af
Date: Fri Feb 24 08:14:11 2012
New Revision: 1293126

URL: http://svn.apache.org/viewvc?rev=1293126&view=rev
Log:
118569: Added missing mac patch for apr-util/

Added:
    incubator/ooo/trunk/ext_libraries/apr-util/apr-util-1.4.1.mac.expat.patch

Added: incubator/ooo/trunk/ext_libraries/apr-util/apr-util-1.4.1.mac.expat.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/apr-util/apr-util-1.4.1.mac.expat.patch?rev=1293126&view=auto
==============================================================================
--- incubator/ooo/trunk/ext_libraries/apr-util/apr-util-1.4.1.mac.expat.patch (added)
+++ incubator/ooo/trunk/ext_libraries/apr-util/apr-util-1.4.1.mac.expat.patch Fri Feb 24 08:14:11
2012
@@ -0,0 +1,16 @@
+--- misc/apr-util-1.4.1/build/apu-conf.m4	2011-08-08 11:32:27.000000000 +0200
++++ misc/build/apr-util-1.4.1/build/apu-conf.m4	2012-02-22 16:39:05.000000000 +0100
+@@ -87,8 +87,13 @@
+ dnl
+ AC_DEFUN([APU_SYSTEM_EXPAT], [
+  
++  APU_TRY_EXPAT_LINK([OpenOffice expat], apu_cv_expat_openoffice,
++     [expat.h], [-lexpat_xmlparse -lexpat_xmltok])
++
++  if test $apu_has_expat = 0; then
+   APU_TRY_EXPAT_LINK([Expat 1.95.x], apu_cv_expat_system, 
+     [expat.h], [-lexpat])
++  fi
+ 
+   if test $apu_has_expat = 0; then
+     APU_TRY_EXPAT_LINK([old Debian-packaged expat], apu_cv_expat_debian,



Mime
View raw message