From: Joe Watkins <krakjoe@php.net>
Date: Fri, 6 Jan 2017 16:04:52 +0000 (+0000)
Subject: fix broken build scripts #2124
X-Git-Tag: php-7.2.0alpha1~613
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8e447eafd9adae37fb476bb503e7d62bbf52b33c;p=php

fix broken build scripts #2124
---

diff --git a/acinclude.m4 b/acinclude.m4
index 900ef4f3aa..dc75c0acab 100644
--- 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 7cd78fabad..d3f8bb2136 100644
--- 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 b86925e295..240590da74 100644
--- 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 \