1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42
|
From: =?utf-8?b?T25kxZllaiBTdXLDvQ==?= <ondrej@sury.org>
Date: Sun, 18 Oct 2020 20:38:15 +0200
Subject: In phpize, also copy config.guess, config.sub,
ltmain.sh and shtool from their respective packages
---
scripts/phpize.in | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/scripts/phpize.in b/scripts/phpize.in
index 0874c3e..66086aa 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")
}
|