diff -urNp -x '*.orig' php-7.2.34.org/scripts/phpize.in php-7.2.34/scripts/phpize.in --- php-7.2.34.org/scripts/phpize.in 2021-08-24 01:07:39.579918736 +0200 +++ php-7.2.34/scripts/phpize.in 2021-08-24 01:07:40.736584469 +0200 @@ -6,10 +6,16 @@ datarootdir='@datarootdir@' 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 ax_check_compile_flag.m4" +FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool ax_check_compile_flag.m4" +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 .libs/ build/ modules/ install-sh \ mkinstalldirs missing config.nice config.sub config.guess configure configure.ac \ @@ -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/build" && cat ../acinclude.m4 $LIBTOOL_FILES > ../aclocal.m4) } phpize_replace_prefix()