summaryrefslogtreecommitdiff
path: root/buildconf
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 /buildconf
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 'buildconf')
-rwxr-xr-xbuildconf14
1 files changed, 7 insertions, 7 deletions
diff --git a/buildconf b/buildconf
index 6e644df4b8..4c0fe37a7e 100755
--- a/buildconf
+++ b/buildconf
@@ -27,12 +27,12 @@ while test $# -gt 0; do
PHP buildconf
A wrapper around the autoconf and autoheader that generate files for building
-PHP on *nix systems (configure, main/php_config.h.in, aclocal.m4...). The
-configure script is used to customize the PHP build based on the provided
-options and system. PHP releases downloaded from PHP.net already include the
-configure script so installing Autoconf and running buildconf is not needed. For
-the PHP sources from the Git repository, buildconf is used for generating a new
-configure script and required files.
+PHP on *nix systems (configure and main/php_config.h.in). The configure script
+is used to customize the PHP build based on the provided options and system. PHP
+releases downloaded from PHP.net already include the configure script so
+installing Autoconf and running buildconf is not needed. For the PHP sources
+from the Git repository, buildconf is used for generating a new configure script
+and required files.
SYNOPSIS:
buildconf [<options>]
@@ -103,4 +103,4 @@ $MAKE -s -f build/build.mk \
PHP_AUTOCONF="$PHP_AUTOCONF" \
PHP_AUTOHEADER="$PHP_AUTOHEADER" \
PHP_AUTOCONF_FLAGS="$autoconf_flags" \
- PHP_M4_FILES="$(echo TSRM/*.m4 Zend/Zend.m4 ext/*/config*.m4 sapi/*/config*.m4)"
+ PHP_M4_FILES="$(echo TSRM/*.m4 Zend/Zend.m4 build/*.m4 ext/*/config*.m4 sapi/*/config*.m4)"