better libtool patch (can handle libtoo1/libtool2 itself) from debian

diff --git a/php-libtool.patch b/php-libtool.patch
index 380cd0aaba7d1672c854c8319856a6900c43baaf..f9713d808e36cefd94bf442e9e1ebef78278d5e5 100644 (file)
--- a/php-libtool.patch
+++ b/php-libtool.patch
@@ -1,20 +1,31 @@
---- php/scripts/phpize.in.org  2008-06-16 10:03:28.882568639 +0200
-+++ php/scripts/phpize.in      2008-06-16 10:04:37.424018256 +0200
-@@ -8,7 +8,7 @@
+--- php-5.4.6/scripts/phpize.in~       2012-08-23 03:02:42.000000000 +0300
++++ php-5.4.6/scripts/phpize.in        2012-08-23 10:16:37.011306948 +0300
+@@ -6,10 +6,16 @@
+ exec_prefix="`eval echo @exec_prefix@`"
+ phpdir="`eval echo @libdir@`/php/build"
+ includedir="`eval echo @includedir@`/php"
++aclocaldir="$prefix/share/aclocal"
  builddir="`pwd`"
  SED="@SED@"
  
 -FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4"
-+FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4"
++FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool"
++if [ -f "$aclocaldir/ltsugar.m4" ]; then
++    LIBTOOL_FILES="libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4"
++else
++    LIBTOOL_FILES="libtool.m4"
++fi
  FILES="acinclude.m4 Makefile.global config.sub config.guess ltmain.sh run-tests*.php"
  CLEAN_FILES="$FILES *.o *.lo *.la .deps .libs/ build/ include/ modules/ install-sh \
        mkinstalldirs missing config.nice config.sub config.guess configure configure.in \
-@@ -127,7 +127,7 @@
+@@ -145,8 +151,9 @@ phpize_copy_files()
+   test -d build || mkdir build
   
    (cd "$phpdir" && cp $FILES_BUILD "$builddir"/build)
++  (cd "$aclocaldir" && cp $LIBTOOL_FILES "$builddir"/build)
    (cd "$phpdir" && cp $FILES "$builddir")
 -  (cd "$builddir" && cat acinclude.m4 ./build/libtool.m4 > aclocal.m4)
-+  (cd "$builddir" && cat acinclude.m4 ./build/{libtool,lt~obsolete,ltoptions,ltsugar,ltversion}.m4 > aclocal.m4)
++  (cd "$builddir/build" && cat ../acinclude.m4 $LIBTOOL_FILES > ../aclocal.m4)
  }
  
  phpize_replace_prefix()