summaryrefslogtreecommitdiff
path: root/scripts/phpize.in
diff options
context:
space:
mode:
authorPeter Kokot <peterkokot@gmail.com>2019-03-13 00:25:07 +0100
committerPeter Kokot <peterkokot@gmail.com>2019-04-23 20:28:45 +0200
commit4e7064d173d2b5b22e159fcf52d22b10213b67b8 (patch)
tree3741ce291c096fa1cf990bf98a5010f5bac65adc /scripts/phpize.in
parent96a9fb20522fd92295b6191ff57deaa671f0bea5 (diff)
downloadphp-git-4e7064d173d2b5b22e159fcf52d22b10213b67b8.tar.gz
Move acinclude.m4 to build/php.m4
The acinclude.m4 file is in a usual Autotools build processed with Automake's aclocal tool. Since PHP currently doesn't use Automake and aclocal this file can be moved into the build directory. PHP build system currently generates a combined aclocal.m4 file that Autoconf can processes automatically. However, a newer practice is writing all local macros in separate dedicated files prefixed with package name, in PHP's case PHP_MACRO_NAME and putting them in a common `m4` directory. PHP uses currently `build` directory for this purpose. Name `php.m4` probably most resembles such file for PHP's case. PHP manually created the aclocal.m4 file from acinclude.m4 and build/libtool.m4. Which is also not a particularly good practice [1], so this patch also removes the generated alocal.m4 usage and uses m4_include() calls manually in the configure.ac and phpize.m4 files manually. - sort order is not important but can be alphabetical - list of *.m4 files prerequisites for configure script generation updated - Moving m4_include() before AC_INIT also removes all comments starting with hash character (`#`) in the included files. [1] https://autotools.io/autoconf/macros.html
Diffstat (limited to 'scripts/phpize.in')
-rw-r--r--scripts/phpize.in7
1 files changed, 3 insertions, 4 deletions
diff --git a/scripts/phpize.in b/scripts/phpize.in
index ccb9357574..7a10a369bf 100644
--- a/scripts/phpize.in
+++ b/scripts/phpize.in
@@ -9,11 +9,11 @@ includedir="`eval echo @includedir@`/php"
builddir="`pwd`"
SED="@SED@"
-FILES_BUILD="shtool libtool.m4 ax_check_compile_flag.m4 ax_gcc_func_attribute.m4 php_cxx_compile_stdcxx.m4 pkg.m4 config.guess config.sub ltmain.sh Makefile.global"
-FILES="acinclude.m4 run-tests*.php"
+FILES_BUILD="php.m4 shtool libtool.m4 ax_check_compile_flag.m4 ax_gcc_func_attribute.m4 php_cxx_compile_stdcxx.m4 pkg.m4 config.guess config.sub ltmain.sh Makefile.global"
+FILES="run-tests*.php"
CLEAN_FILES="$FILES *.o *.lo *.la .libs/ build/ modules/ \
config.nice configure configure.ac \
- aclocal.m4 config.h config.h.in conftest* libtool config.cache autom4te.cache/ \
+ config.h config.h.in conftest* libtool config.cache autom4te.cache/ \
config.log config.status Makefile Makefile.fragments Makefile.objects confdefs.h \
run-tests*.php tests/*.diff tests/*.exp tests/*.log tests/*.out tests/*.php"
@@ -146,7 +146,6 @@ phpize_copy_files()
(cd "$phpdir" && cp $FILES_BUILD "$builddir"/build)
(cd "$phpdir" && cp $FILES "$builddir")
- (cd "$builddir" && cat acinclude.m4 ./build/libtool.m4 > aclocal.m4)
}
phpize_replace_prefix()