From 90f8d0d3e4ce4b1f4118d35eba6a051558323ace Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Wed, 9 Apr 2008 06:42:08 -0600 Subject: [PATCH] Avoid some autoconf warnings. * m4/regex.m4 (gl_REGEX): s/AC_HELP_STRING/AS_HELP_STRING/. * m4/include_next.m4 (gl_INCLUDE_NEXT): s/AC_FOREACH/m4_foreach_w/. Signed-off-by: Eric Blake --- ChangeLog | 6 ++++++ m4/include_next.m4 | 4 ++-- m4/regex.m4 | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3461092bf..64704e559 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-04-09 Eric Blake + + Avoid some autoconf warnings. + * m4/regex.m4 (gl_REGEX): s/AC_HELP_STRING/AS_HELP_STRING/. + * m4/include_next.m4 (gl_INCLUDE_NEXT): s/AC_FOREACH/m4_foreach_w/. + 2008-04-08 Eric Blake Use 'git describe --match' if present (added in git 1.5.5). diff --git a/m4/include_next.m4 b/m4/include_next.m4 index 7c08e9319..a842e2a23 100644 --- a/m4/include_next.m4 +++ b/m4/include_next.m4 @@ -1,4 +1,4 @@ -# include_next.m4 serial 5 +# include_next.m4 serial 6 dnl Copyright (C) 2006-2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -71,7 +71,7 @@ AC_DEFUN([gl_CHECK_NEXT_HEADERS], AC_REQUIRE([gl_INCLUDE_NEXT]) AC_CHECK_HEADERS_ONCE([$1]) - AC_FOREACH([gl_HEADER_NAME], [$1], + m4_foreach_w([gl_HEADER_NAME], [$1], [AS_VAR_PUSHDEF([gl_next_header], [gl_cv_next_]m4_quote(m4_defn([gl_HEADER_NAME]))) if test $gl_cv_have_include_next = yes; then diff --git a/m4/regex.m4 b/m4/regex.m4 index 4879bd875..656cef76e 100644 --- a/m4/regex.m4 +++ b/m4/regex.m4 @@ -1,4 +1,4 @@ -#serial 49 +#serial 50 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, # 2006, 2007, 2008 Free Software Foundation, Inc. @@ -17,7 +17,7 @@ AC_DEFUN([gl_REGEX], AC_CHECK_HEADERS_ONCE([locale.h]) AC_ARG_WITH([included-regex], - [AC_HELP_STRING([--without-included-regex], + [AS_HELP_STRING([--without-included-regex], [don't compile regex; this is the default on 32-bit systems with recent-enough versions of the GNU C Library (use with caution on other systems). -- 2.11.0