fix broken build scripts #2124

diff --git a/acinclude.m4 b/acinclude.m4
index 900ef4f3aa305a7e0e3ab869220d60336eb2abda..dc75c0acab13bd4eae48fbca1f92edf2b6978e0a 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -3220,4 +3220,4 @@ AC_DEFUN([PHP_CHECK_BUILTIN_SSUBLL_OVERFLOW], [
 ])
 
 dnl Load the AX_CHECK_COMPILE_FLAG macro from the autoconf archive.
-m4_include([m4/ax_check_compile_flag.m4])
+m4_include([build/ax_check_compile_flag.m4])

diff --git a/m4/ax_check_compile_flag.m4 b/build/ax_check_compile_flag.m4
similarity index 100%
rename from m4/ax_check_compile_flag.m4
rename to build/ax_check_compile_flag.m4

diff --git a/scripts/Makefile.frag b/scripts/Makefile.frag
index 7cd78fabad0736d2491774e2c4f23723ad0fabdd..d3f8bb21368ec1eea03b809261f4f437c07a611e 100644 (file)
--- a/scripts/Makefile.frag
+++ b/scripts/Makefile.frag
@@ -11,6 +11,7 @@ BUILD_FILES = \
        build/mkdep.awk \
        build/scan_makefile_in.awk \
        build/libtool.m4 \
+       build/ax_check_compile_flag.m4 \
        Makefile.global \
        acinclude.m4 \
        ltmain.sh \

diff --git a/scripts/phpize.in b/scripts/phpize.in
index b86925e295c5ca66a72f9140c7d9fc2cef742ea4..240590da743d3884c45e60ae8c4aef962848fde4 100644 (file)
--- a/scripts/phpize.in
+++ b/scripts/phpize.in
@@ -9,7 +9,7 @@ includedir="`eval echo @includedir@`/php"
 builddir="`pwd`"
 SED="@SED@"
 
-FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4"
+FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4 ax_check_compile_flag.m4"
 FILES="acinclude.m4 Makefile.global config.sub config.guess ltmain.sh run-tests*.php"
 CLEAN_FILES="$FILES *.o *.lo *.la .deps .libs/ build/ modules/ install-sh \
        mkinstalldirs missing config.nice config.sub config.guess configure configure.in \