From 3fce1aae039d0440cb9c794808c4a7e68a0060c5 Mon Sep 17 00:00:00 2001
From: Travis Cross <tc@traviscross.com>
Date: Thu, 17 Oct 2013 03:05:12 +0000
Subject: [PATCH] Fix build of apr-util expat with libtool2

Applied patch from:
http://people.apache.org/~rjung/patches/expat-libtool2.patch

The failure that results from this seems to occur
non-deterministically.

FS-3185 --resolve
---
 libs/apr-util/xml/expat/buildconf.sh | 34 +++++++++++++++++-----------
 libs/apr-util/xml/expat/configure.in |  1 +
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/libs/apr-util/xml/expat/buildconf.sh b/libs/apr-util/xml/expat/buildconf.sh
index 1f5789dc07..9050a0282a 100755
--- a/libs/apr-util/xml/expat/buildconf.sh
+++ b/libs/apr-util/xml/expat/buildconf.sh
@@ -28,26 +28,34 @@ rm -rf aclocal.m4 libtool.m4 ltsugar.m4 autom4te*.cache
 $libtoolize --copy --automake
 
 #
-# Build aclocal.m4 from libtool's libtool.m4
+# find libtool.m4
 #
-if [ -f libtool.m4 ]; then
-  ltfile=libtool.m4
-else
+if [ ! -f libtool.m4 ]; then
   ltpath=`dirname $libtoolize`
   ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
+  if [ -f $ltfile ]; then
+    echo "libtool.m4 found at $ltfile"
+    cp $ltfile libtool.m4
+  else
+    echo "libtool.m4 not found - aborting!"
+    exit 1
+  fi
 fi
-echo "Incorporating $ltfile into aclocal.m4 ..."
+
+#
+# Build aclocal.m4 from libtool's m4 files
+#
 echo "dnl THIS FILE IS AUTOMATICALLY GENERATED BY buildconf.sh" > aclocal.m4
 echo "dnl edits here will be lost" >> aclocal.m4
-cat $ltfile >> aclocal.m4
 
-if [ -f ltsugar.m4 ]; then
-  echo "Incorporating ltsugar.m4 into aclocal.m4 ..."
-  cat ltsugar.m4 >> aclocal.m4
-fi
-
-# Clean up again
-rm -f libtool.m4 ltsugar.m4
+for m4file in libtool.m4 ltsugar.m4 ltoptions.m4 ltversion.m4 lt~obsolete.m4
+do
+  if [ -f $m4file ]; then
+    echo "Incorporating $m4file into aclocal.m4 ..."
+    cat $m4file >> aclocal.m4
+    rm -f $m4file
+  fi
+done
 
 cross_compile_warning="warning: AC_TRY_RUN called without default to allow cross compiling"
 
diff --git a/libs/apr-util/xml/expat/configure.in b/libs/apr-util/xml/expat/configure.in
index 478d8d5313..f808df4cce 100644
--- a/libs/apr-util/xml/expat/configure.in
+++ b/libs/apr-util/xml/expat/configure.in
@@ -12,6 +12,7 @@ dnl
 
 AC_INIT(Makefile.in)
 AC_CONFIG_AUX_DIR(conftools)
+AC_CONFIG_MACRO_DIR(.)
 
 dnl
 dnl Follow the GNU/Linux convention of odd number minor version for