diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.frag | 2 | ||||
| -rw-r--r-- | scripts/phpize.in | 7 | ||||
| -rw-r--r-- | scripts/phpize.m4 | 9 |
3 files changed, 13 insertions, 5 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 = \ 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]) |