diff options
| author | Michael Orlitzky <michael@orlitzky.com> | 2016-09-14 13:13:15 -0400 |
|---|---|---|
| committer | Michael Orlitzky <michael@orlitzky.com> | 2016-09-14 13:21:19 -0400 |
| commit | 672178ff2c5ca8f82836d0b8f8a7657b762bb5d0 (patch) | |
| tree | 4b46395d1803c16b0c7eda3d9e20d6fd88021840 /acinclude.m4 | |
| parent | 086f9adc4d6fe58b75e419cd6312afdbf3d90277 (diff) | |
| download | php-git-672178ff2c5ca8f82836d0b8f8a7657b762bb5d0.tar.gz | |
Ship AX_CHECK_COMPILE_FLAG in a separate file to preserve its license.
In commit 086f9ad, I added a new macro AX_CHECK_COMPILE_FLAG from the
autoconf archive. Jakub Zelenka pointed out that the license of the
macro (GPL-3+ with exception) does not agree with the license of PHP
itself (PHP-3.01). We should therefore ship the macro in a separate
file with its own license header. That is allowed and is done for
many other files in the PHP repository.
This commit adds a new top-level "m4" directory and places the
upstream ax_check_compile_flag.m4 file in it. The macro is no longer
inlined; instead, our acinclude.m4 now includes the aforementioned
file with m4_include.
PHP-Bug: 73062
Pull-Request: 2124
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 516e0e4a2e..459b33d89c 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -3232,20 +3232,5 @@ AC_DEFUN([PHP_CHECK_BUILTIN_SSUBLL_OVERFLOW], [ ]) -dnl This macro hails from the autoconf archive. This revision is -dnl from 2015-01-06. -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 +dnl Load the AX_CHECK_COMPILE_FLAG macro from the autoconf archive. +m4_include([m4/ax_check_compile_flag.m4]) |