From 4e7064d173d2b5b22e159fcf52d22b10213b67b8 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Wed, 13 Mar 2019 00:25:07 +0100 Subject: 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 --- scripts/Makefile.frag | 2 +- scripts/phpize.in | 7 +++---- scripts/phpize.m4 | 9 +++++++++ 3 files changed, 13 insertions(+), 5 deletions(-) (limited to 'scripts') diff --git a/scripts/Makefile.frag b/scripts/Makefile.frag index db8ff60c06..bfbac62ab3 100644 --- a/scripts/Makefile.frag +++ b/scripts/Makefile.frag @@ -14,7 +14,7 @@ BUILD_FILES = \ build/php_cxx_compile_stdcxx.m4 \ build/pkg.m4 \ build/Makefile.global \ - acinclude.m4 \ + build/php.m4 \ run-tests.php BUILD_FILES_EXEC = \ 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() diff --git a/scripts/phpize.m4 b/scripts/phpize.m4 index d3b471b5cd..61af6c2b74 100644 --- a/scripts/phpize.m4 +++ b/scripts/phpize.m4 @@ -1,5 +1,14 @@ dnl This file becomes configure.ac for self-contained extensions. +dnl Include external macro definitions before the AC_INIT to also remove +dnl comments starting with # and empty newlines from the included files. +m4_include([build/ax_check_compile_flag.m4]) +m4_include([build/ax_gcc_func_attribute.m4]) +m4_include([build/libtool.m4]) +m4_include([build/php_cxx_compile_stdcxx.m4]) +m4_include([build/php.m4]) +m4_include([build/pkg.m4]) + AC_PREREQ([2.68]) AC_INIT AC_CONFIG_SRCDIR([config.m4]) -- cgit v1.2.1