Skip to content

Commit 14a59a1

Browse files
committed
Update ax_check_compile_flag.m4
1 parent 2d89185 commit 14a59a1

File tree

1 file changed

+12
-31
lines changed

1 file changed

+12
-31
lines changed

scripts/autotools/m4/ax_check_compile_flag.m4

Lines changed: 12 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# ===========================================================================
2-
# http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
2+
# https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
33
# ===========================================================================
44
#
55
# SYNOPSIS
66
#
7-
# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS])
7+
# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
88
#
99
# DESCRIPTION
1010
#
@@ -19,6 +19,8 @@
1919
# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to
2020
# force the compiler to issue an error when a bad flag is given.
2121
#
22+
# INPUT gives an alternative input source to AC_COMPILE_IFELSE.
23+
#
2224
# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
2325
# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
2426
#
@@ -27,45 +29,24 @@
2729
# Copyright (c) 2008 Guido U. Draheim <[email protected]>
2830
# Copyright (c) 2011 Maarten Bosmans <[email protected]>
2931
#
30-
# This program is free software: you can redistribute it and/or modify it
31-
# under the terms of the GNU General Public License as published by the
32-
# Free Software Foundation, either version 3 of the License, or (at your
33-
# option) any later version.
34-
#
35-
# This program is distributed in the hope that it will be useful, but
36-
# WITHOUT ANY WARRANTY; without even the implied warranty of
37-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
38-
# Public License for more details.
39-
#
40-
# You should have received a copy of the GNU General Public License along
41-
# with this program. If not, see <http://www.gnu.org/licenses/>.
42-
#
43-
# As a special exception, the respective Autoconf Macro's copyright owner
44-
# gives unlimited permission to copy, distribute and modify the configure
45-
# scripts that are the output of Autoconf when processing the Macro. You
46-
# need not follow the terms of the GNU General Public License when using
47-
# or distributing such scripts, even though portions of the text of the
48-
# Macro appear in them. The GNU General Public License (GPL) does govern
49-
# all other use of the material that constitutes the Autoconf Macro.
50-
#
51-
# This special exception to the GPL applies to versions of the Autoconf
52-
# Macro released by the Autoconf Archive. When you make and distribute a
53-
# modified version of the Autoconf Macro, you may extend this special
54-
# exception to the GPL to apply to your modified version as well.
32+
# Copying and distribution of this file, with or without modification, are
33+
# permitted in any medium without royalty provided the copyright notice
34+
# and this notice are preserved. This file is offered as-is, without any
35+
# warranty.
5536

56-
#serial 2
37+
#serial 6
5738

5839
AC_DEFUN([AX_CHECK_COMPILE_FLAG],
59-
[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX
40+
[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
6041
AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
6142
AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
6243
ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
6344
_AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
64-
AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
45+
AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
6546
[AS_VAR_SET(CACHEVAR,[yes])],
6647
[AS_VAR_SET(CACHEVAR,[no])])
6748
_AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
68-
AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes],
49+
AS_VAR_IF(CACHEVAR,yes,
6950
[m4_default([$2], :)],
7051
[m4_default([$3], :)])
7152
AS_VAR_POPDEF([CACHEVAR])dnl

0 commit comments

Comments
 (0)