]>
Commit | Line | Data |
---|---|---|
30ccba12 JR |
1 | diff -urNp -x '*.orig' php-7.1.33.org/scripts/phpize.in php-7.1.33/scripts/phpize.in |
2 | --- php-7.1.33.org/scripts/phpize.in 2021-08-23 23:46:21.024779883 +0200 | |
3 | +++ php-7.1.33/scripts/phpize.in 2021-08-23 23:46:21.978108040 +0200 | |
4 | @@ -6,10 +6,16 @@ datarootdir='@datarootdir@' | |
562f6a1b ER |
5 | exec_prefix="`eval echo @exec_prefix@`" |
6 | phpdir="`eval echo @libdir@`/php/build" | |
7 | includedir="`eval echo @includedir@`/php" | |
8 | +aclocaldir="$prefix/share/aclocal" | |
c0240cb1 | 9 | builddir="`pwd`" |
10 | SED="@SED@" | |
11 | ||
d8a43606 ER |
12 | -FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4 ax_check_compile_flag.m4" |
13 | +FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool ax_check_compile_flag.m4" | |
562f6a1b ER |
14 | +if [ -f "$aclocaldir/ltsugar.m4" ]; then |
15 | + LIBTOOL_FILES="libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4" | |
16 | +else | |
17 | + LIBTOOL_FILES="libtool.m4" | |
18 | +fi | |
c0240cb1 | 19 | FILES="acinclude.m4 Makefile.global config.sub config.guess ltmain.sh run-tests*.php" |
30ccba12 | 20 | CLEAN_FILES="$FILES *.o *.lo *.la .libs/ build/ modules/ install-sh \ |
c0240cb1 | 21 | mkinstalldirs missing config.nice config.sub config.guess configure configure.in \ |
562f6a1b ER |
22 | @@ -145,8 +151,9 @@ phpize_copy_files() |
23 | test -d build || mkdir build | |
30ccba12 | 24 | |
c0240cb1 | 25 | (cd "$phpdir" && cp $FILES_BUILD "$builddir"/build) |
562f6a1b | 26 | + (cd "$aclocaldir" && cp $LIBTOOL_FILES "$builddir"/build) |
c0240cb1 | 27 | (cd "$phpdir" && cp $FILES "$builddir") |
28 | - (cd "$builddir" && cat acinclude.m4 ./build/libtool.m4 > aclocal.m4) | |
562f6a1b | 29 | + (cd "$builddir/build" && cat ../acinclude.m4 $LIBTOOL_FILES > ../aclocal.m4) |
c0240cb1 | 30 | } |
31 | ||
32 | phpize_replace_prefix() |