From: Eric Blake Date: Wed, 28 Jan 2009 16:11:28 +0000 (-0700) Subject: Use AC_DEFUN_ONCE for uncontroversial one-shot macros. X-Git-Tag: v2.63b~27 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8fcfad14630930c1877dcc4915c17be8fa46612;p=thirdparty%2Fautoconf.git Use AC_DEFUN_ONCE for uncontroversial one-shot macros. * lib/autoconf/headers.m4 (AC_HEADER_ASSERT): Switch to AC_DEFUN_ONCE, since this is a one-shot macro. * lib/autoconf/specific.m4 (AC_USE_SYSTEM_EXTENSIONS): Likewise. * lib/autoconf/general.m4 (AC_CANONICAL_BUILD) (AC_CANONICAL_HOST, AC_CANONICAL_TARGET): Likewise. Signed-off-by: Eric Blake --- diff --git a/ChangeLog b/ChangeLog index 33cadf89f..a706db25a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2009-01-28 Eric Blake + + Use AC_DEFUN_ONCE for uncontroversial one-shot macros. + * lib/autoconf/headers.m4 (AC_HEADER_ASSERT): Switch to + AC_DEFUN_ONCE, since this is a one-shot macro. + * lib/autoconf/specific.m4 (AC_USE_SYSTEM_EXTENSIONS): Likewise. + * lib/autoconf/general.m4 (AC_CANONICAL_BUILD) + (AC_CANONICAL_HOST, AC_CANONICAL_TARGET): Likewise. + 2009-01-28 Eric Blake Reduce blank lines in AC_DEFUN_ONCE macros. diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4 index cb7e5c2a6..83254ed1e 100644 --- a/lib/autoconf/general.m4 +++ b/lib/autoconf/general.m4 @@ -1791,7 +1791,7 @@ AC_SUBST([$1_os])dnl # AC_CANONICAL_BUILD # ------------------ -AC_DEFUN([AC_CANONICAL_BUILD], +AC_DEFUN_ONCE([AC_CANONICAL_BUILD], [AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl AC_REQUIRE_AUX_FILE([config.sub])dnl AC_REQUIRE_AUX_FILE([config.guess])dnl @@ -1818,7 +1818,7 @@ _AC_CANONICAL_SPLIT(build) # AC_CANONICAL_HOST # ----------------- -AC_DEFUN([AC_CANONICAL_HOST], +AC_DEFUN_ONCE([AC_CANONICAL_HOST], [AC_REQUIRE([AC_CANONICAL_BUILD])dnl m4_divert_once([HELP_CANON], [[ --host=HOST cross-compile to build programs to run on HOST [BUILD]]])dnl @@ -1836,7 +1836,7 @@ _AC_CANONICAL_SPLIT([host]) # AC_CANONICAL_TARGET # ------------------- -AC_DEFUN([AC_CANONICAL_TARGET], +AC_DEFUN_ONCE([AC_CANONICAL_TARGET], [AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_BEFORE([$0], [AC_ARG_PROGRAM])dnl m4_divert_once([HELP_CANON], diff --git a/lib/autoconf/headers.m4 b/lib/autoconf/headers.m4 index 3702a8560..120adc950 100644 --- a/lib/autoconf/headers.m4 +++ b/lib/autoconf/headers.m4 @@ -431,7 +431,7 @@ AN_HEADER([wctype.h], [AC_CHECK_HEADERS]) # AC_HEADER_ASSERT # ---------------- # Check whether to enable assertions. -AC_DEFUN([AC_HEADER_ASSERT], +AC_DEFUN_ONCE([AC_HEADER_ASSERT], [ AC_MSG_CHECKING([whether to enable assertions]) AC_ARG_ENABLE([assert], diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4 index 5fcfe377c..322364e25 100644 --- a/lib/autoconf/specific.m4 +++ b/lib/autoconf/specific.m4 @@ -2,8 +2,8 @@ # Macros that test for specific, unclassified, features. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, -# Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software +# Foundation, Inc. # # 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 @@ -383,7 +383,7 @@ matches *mingw32*])# AC_MINGW32 # AC_DEFINE. The goal here is to define all known feature-enabling # macros, then, if reports of conflicts are made, disable macros that # cause problems on some platforms (such as __EXTENSIONS__). -AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS], +AC_DEFUN_ONCE([AC_USE_SYSTEM_EXTENSIONS], [AC_BEFORE([$0], [AC_COMPILE_IFELSE])dnl AC_BEFORE([$0], [AC_RUN_IFELSE])dnl