From: Ondřej Surý <ondrej@sury.org>
Date: Sun, 18 Oct 2020 18:38:15 +0000 (+0200)
Subject: In phpize, also copy config.guess, config.sub, ltmain.sh and shtool from their respec... 
X-Git-Tag: archive/raspbian/8.4.11-1+rpi1^2~11
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bb53d364b42809d6bb7d40918a84fde4495f6d3f;p=php8.4.git

In phpize, also copy config.guess, config.sub, ltmain.sh and shtool from their respective packages


Gbp-Pq: Name 0036-In-phpize-also-copy-config.guess-config.sub-ltmain.s.patch
---

diff --git a/scripts/phpize.in b/scripts/phpize.in
index 7a711678..0dcfe21d 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/ \
@@ -149,6 +156,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")
 }