diff options
author | Peter Kokot <peterkokot@gmail.com> | 2019-03-13 00:25:07 +0100 |
---|---|---|
committer | Peter Kokot <peterkokot@gmail.com> | 2019-04-23 20:28:45 +0200 |
commit | 4e7064d173d2b5b22e159fcf52d22b10213b67b8 (patch) | |
tree | 3741ce291c096fa1cf990bf98a5010f5bac65adc /scripts/Makefile.frag | |
parent | 96a9fb20522fd92295b6191ff57deaa671f0bea5 (diff) | |
download | php-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/Makefile.frag')
-rw-r--r-- | scripts/Makefile.frag | 2 |
1 files changed, 1 insertions, 1 deletions
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 = \ |