--- a/ChangeLog	Tue Apr 08 07:38:18 2008 -0600
+++ b/ChangeLog	Wed Apr 09 06:42:08 2008 -0600
@@ -1,3 +1,9 @@
+2008-04-09  Eric Blake  <ebb9@byu.net>
+
+	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  <ebb9@byu.net>
 
 	Use 'git describe --match' if present (added in git 1.5.5).

--- a/m4/include_next.m4	Tue Apr 08 07:38:18 2008 -0600
+++ b/m4/include_next.m4	Wed Apr 09 06:42:08 2008 -0600
@@ -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_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

--- a/m4/regex.m4	Tue Apr 08 07:38:18 2008 -0600
+++ b/m4/regex.m4	Wed Apr 09 06:42:08 2008 -0600
@@ -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_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).