From 8e447eafd9adae37fb476bb503e7d62bbf52b33c Mon Sep 17 00:00:00 2001 From: Joe Watkins Date: Fri, 6 Jan 2017 16:04:52 +0000 Subject: [PATCH] fix broken build scripts #2124 --- acinclude.m4 | 2 +- {m4 => build}/ax_check_compile_flag.m4 | 0 scripts/Makefile.frag | 1 + scripts/phpize.in | 2 +- 4 files changed, 3 insertions(+), 2 deletions(-) rename {m4 => build}/ax_check_compile_flag.m4 (100%) 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 \ -- 2.50.1