nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 05:03:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

m4: update ax_check_compile_flag.m4 from autoconf-archive

Browse Source 
I noticed this when doing some M4 macro analysis work, and saw
that the version of `ax_check_compile_flag.m4` in Tor has two serial
lines ('serial 5' and 'serial 6') which is invalid.

We could just fix one of the lines, but it makes more sense to just
sync with upstream, I think.

Import ax_check_compile_flag.m4 from autoconf-archive at latest
commit at time of writing (4e8aab846b0872fba99f1fe02ebcdff178a34c87).

Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James 2024-04-19 09:59:19 +01:00
parent a9d2977c1b
commit 8888e4ca6b
No known key found for this signature in database
GPG Key ID: 738409F520DF9190
1 changed files with 39 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
m4/ax_check_compile_flag.m4
View File

@ -1,43 +1,45 @@
# Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de> # ===========================================================================
# Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com> # https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
# # ===========================================================================
# 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 # SYNOPSIS
# Free Software Foundation, either version 3 of the License, or (at your #
# option) any later version. # AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
# #
# This program is distributed in the hope that it will be useful, but # DESCRIPTION
# WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General # Check whether the given FLAG works with the current language's compiler
# Public License for more details. # or gives an error. (Warnings, however, are ignored)
# #
# You should have received a copy of the GNU General Public License along # ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
# with this program. If not, see <https://www.gnu.org/licenses/>. # success/failure.
# #
# As a special exception, the respective Autoconf Macro's copyright owner # If EXTRA-FLAGS is defined, it is added to the current language's default
# gives unlimited permission to copy, distribute and modify the configure # flags (e.g. CFLAGS) when the check is done. The check is thus made with
# scripts that are the output of Autoconf when processing the Macro. You # the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to
# need not follow the terms of the GNU General Public License when using # force the compiler to issue an error when a bad flag is given.
# or distributing such scripts, even though portions of the text of the #
# Macro appear in them. The GNU General Public License (GPL) does govern # INPUT gives an alternative input source to AC_COMPILE_IFELSE.
# all other use of the material that constitutes the Autoconf Macro. #
# # NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
# This special exception to the GPL applies to versions of the Autoconf # macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
# Macro released by the Autoconf Archive. When you make and distribute a #
# modified version of the Autoconf Macro, you may extend this special # LICENSE
# exception to the GPL to apply to your modified version as well. #
# Copying and distribution of this file, with or without modification, are # Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
# permitted in any medium without royalty provided the copyright notice # Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
# and this notice are preserved. This file is offered as-is, without any #
# warranty. # Copying and distribution of this file, with or without modification, are
# permitted in any medium without royalty provided the copyright notice
# and this notice are preserved. This file is offered as-is, without any
# warranty.
#serial 5 #serial 7
#serial 6
AC_DEFUN([AX_CHECK_COMPILE_FLAG], AC_DEFUN([AX_CHECK_COMPILE_FLAG],
[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF [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 AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ AC_CACHE_CHECK([whether the _AC_LANG compiler accepts $1], CACHEVAR, [
ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
_AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])], AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],