summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbuildconf6
-rw-r--r--patch-ltmain.sh10
2 files changed, 14 insertions, 2 deletions
diff --git a/buildconf b/buildconf
index c584867d2e..5f41d01ee8 100755
--- a/buildconf
+++ b/buildconf
@@ -114,7 +114,9 @@ fi
./scripts/preconfig
+rm -f ltmain.sh
libtoolize --automake $automake_flags --force
+patch < patch-ltmain.sh
mv aclocal.m4 aclocal.m4.old 2>/dev/null
aclocal
@@ -136,10 +138,10 @@ fi
autoheader
-# suppress stupid automake warning
+# find all Makefile.ams
files=`find . -name Makefile.am | sed 's#\.am##' | tr '\n' ' '`
-
+# suppress stupid automake warning
automake --add-missing --include-deps $automake_flags $files 2>&1 | grep -v \$PHP_OUTPUT_FILES >&2
diff --git a/patch-ltmain.sh b/patch-ltmain.sh
new file mode 100644
index 0000000000..dc6e3524e0
--- /dev/null
+++ b/patch-ltmain.sh
@@ -0,0 +1,10 @@
+--- /usr/local/share/libtool/ltmain.sh Wed Jul 14 14:46:28 1999
++++ ltmain.sh Tue Oct 5 19:01:41 1999
+@@ -1955,6 +1955,7 @@
+ done
+ done
+ if test -n "$a_deplib" ; then
++ newdeplibs="$newdeplibs $a_deplib"
+ droppeddeps=yes
+ echo
+ echo "*** Warning: This library needs some functionality provided by $a_deplib."