com php-src: fix build broken by #2124: acinclude.m4 build/ax_check_compile_flag.m4 scripts/Makefile.f rag scripts/phpize.in

From: Date: Fri, 06 Jan 2017 16:18:24 +0000
Subject: com php-src: fix build broken by #2124: acinclude.m4 build/ax_check_compile_flag.m4 scripts/Makefile.f rag scripts/phpize.in
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-96571@lists.php.net to get a copy of this message
Commit: 699ab98f9db9a57f3d352b9dc3b1558a6ef55930 Author: Joe Watkins <krakjoe@php.net> Fri, 6 Jan 2017 16:18:24 +0000 Parents: ad08aa39561eb6aa3d03b2be06ed3894dbb2892c Branches: PHP-7.0 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=699ab98f9db9a57f3d352b9dc3b1558a6ef55930 Log: fix build broken by #2124 Bugs: https://bugs.php.net/2124 Changed paths: M acinclude.m4 A build/ax_check_compile_flag.m4 M scripts/Makefile.frag M scripts/phpize.in Diff: diff --git a/acinclude.m4 b/acinclude.m4 index 5fa893f..234dcd7 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -3109,3 +3109,6 @@ AC_DEFUN([PHP_CHECK_BUILTIN_CTZLL], [ AC_DEFINE_UNQUOTED([PHP_HAVE_BUILTIN_CTZLL], [$have_builtin_ctzll], [Whether the compiler supports __builtin_ctzll]) ]) + +dnl Load the AX_CHECK_COMPILE_FLAG macro from the autoconf archive. +m4_include([build/ax_check_compile_flag.m4]) diff --git a/build/ax_check_compile_flag.m4 b/build/ax_check_compile_flag.m4 new file mode 100644 index 0000000..ca36397 --- /dev/null +++ b/build/ax_check_compile_flag.m4 @@ -0,0 +1,74 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT]) +# +# DESCRIPTION +# +# Check whether the given FLAG works with the current language's compiler +# or gives an error. (Warnings, however, are ignored) +# +# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on +# success/failure. +# +# If EXTRA-FLAGS is defined, it is added to the current language's default +# flags (e.g. CFLAGS) when the check is done. The check is thus made with +# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to +# force the compiler to issue an error when a bad flag is given. +# +# INPUT gives an alternative input source to AC_COMPILE_IFELSE. +# +# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this +# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de> +# Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com> +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see <http://www.gnu.org/licenses/>. +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 4 + +AC_DEFUN([AX_CHECK_COMPILE_FLAG], +[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF +AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl +AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ + ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS + _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" + AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])], + [AS_VAR_SET(CACHEVAR,[yes])], + [AS_VAR_SET(CACHEVAR,[no])]) + _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags]) +AS_VAR_IF(CACHEVAR,yes, + [m4_default([$2], :)], + [m4_default([$3], :)]) +AS_VAR_POPDEF([CACHEVAR])dnl +])dnl AX_CHECK_COMPILE_FLAGS diff --git a/scripts/Makefile.frag b/scripts/Makefile.frag index 7cd78fa..d3f8bb2 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 b86925e..240590d 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 \

« previous php.cvs (#96571) next »