From 5065f3944dfecea1cf92cc35d80edefbd4eb7450 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Sun, 18 Oct 2020 20:38:15 +0200 Subject: [PATCH] In phpize, also copy config.guess, config.sub, ltmain.sh and shtool from their respective packages Gbp-Pq: Name 0033-In-phpize-also-copy-config.guess-config.sub-ltmain.s.patch --- scripts/phpize.in | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/scripts/phpize.in b/scripts/phpize.in index 0874c3eb..66086aa4 100644 --- a/scripts/phpize.in +++ b/scripts/phpize.in @@ -9,11 +9,18 @@ includedir="$prefix/include/php/@DEBIAN_PHP_API@" builddir="`pwd`" SED="@SED@" +libtool_version=$(dpkg-query -f'${Version}' -W libtool) aclocaldir="$prefix/share/aclocal" -FILES_BUILD="php.m4 shtool ax_check_compile_flag.m4 ax_gcc_func_attribute.m4 php_cxx_compile_stdcxx.m4 \ - config.guess config.sub ltmain.sh Makefile.global gen_stub.php" +if dpkg --compare-versions "$libtool_version" ge 2.4.6-0.1~; then \ + auxdir="/usr/share/libtool/build-aux" +else \ + auxdir="/usr/share/libtool/config" +fi +FILES_BUILD="php.m4 /usr/bin/shtool ax_check_compile_flag.m4 ax_gcc_func_attribute.m4 php_cxx_compile_stdcxx.m4 \ + Makefile.global gen_stub.php" FILES="run-tests*.php" LIBTOOL_FILES="pkg.m4 libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4" +AUX_FILES="config.sub config.guess ltmain.sh" CLEAN_FILES="$FILES *.o *.lo *.la .libs/ build/ modules/ \ config.nice configure configure.ac \ config.h config.h.in conftest* libtool config.cache autom4te.cache/ \ @@ -152,6 +159,7 @@ phpize_copy_files() (cd "$phpdir" && cp $FILES_BUILD "$builddir"/build) (cd "$aclocaldir" && cp $LIBTOOL_FILES "$builddir"/build) + (cd "$auxdir" && cp $AUX_FILES "$builddir"/build) (cd "$phpdir" && cp $FILES "$builddir") } -- 2.30.2