--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,12 @@
+2003-05-17  Bruno Haible  <bruno@clisp.org>
+
+	* dirfd.m4 (UTILS_FUNC_DIRFD): Fix a quoting bug leading to an invalid
+	expansion for AC_EGREP_CPP.
+	* strtoimax.m4 (gl_FUNC_STRTOIMAX): Likewise.
+	* strtoumax.m4 (gl_FUNC_STRTOUMAX): Likewise.
+	Suggested by Akim Demaille <akim@epita.fr> in
+	http://mail.gnu.org/archive/html/bug-autoconf/2003-05/threads.html
+
 2003-04-21  Paul Eggert  <eggert@twinsun.com>
 
 	* error.m4 (gl_ERROR): Do not put under dynamic conditions some

--- a/m4/dirfd.m4
+++ b/m4/dirfd.m4
@@ -1,4 +1,4 @@
-#serial 4
+#serial 5
 
 dnl Find out how to get the file descriptor associated with an open DIR*.
 dnl From Jim Meyering
@@ -31,12 +31,12 @@
 
   AC_CACHE_CHECK([whether dirfd is a macro],
     jm_cv_func_dirfd_macro,
-    AC_EGREP_CPP([dirent_header_defines_dirfd], [$dirfd_headers
+    [AC_EGREP_CPP([dirent_header_defines_dirfd], [$dirfd_headers
 #ifdef dirfd
  dirent_header_defines_dirfd
 #endif],
-      jm_cv_func_dirfd_macro=yes,
-      jm_cv_func_dirfd_macro=no))
+       jm_cv_func_dirfd_macro=yes,
+       jm_cv_func_dirfd_macro=no)])
 
   # Use the replacement only if we have no function, macro,
   # or declaration with that name.

--- a/m4/strtoimax.m4
+++ b/m4/strtoimax.m4
@@ -1,5 +1,5 @@
-# strtoimax.m4 serial 1
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+# strtoimax.m4 serial 2
+dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
 dnl Public License, this file may be distributed as part of a program
@@ -14,12 +14,12 @@
 
   AC_CACHE_CHECK([whether <inttypes.h> defines strtoimax as a macro],
     jm_cv_func_strtoimax_macro,
-    AC_EGREP_CPP([inttypes_h_defines_strtoimax], [#include <inttypes.h>
+    [AC_EGREP_CPP([inttypes_h_defines_strtoimax], [#include <inttypes.h>
 #ifdef strtoimax
  inttypes_h_defines_strtoimax
 #endif],
-      jm_cv_func_strtoimax_macro=yes,
-      jm_cv_func_strtoimax_macro=no))
+       jm_cv_func_strtoimax_macro=yes,
+       jm_cv_func_strtoimax_macro=no)])
 
   if test "$jm_cv_func_strtoimax_macro" != yes; then
     AC_REPLACE_FUNCS(strtoimax)

--- a/m4/strtoumax.m4
+++ b/m4/strtoumax.m4
@@ -1,5 +1,5 @@
-# strtoumax.m4 serial 1
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+# strtoumax.m4 serial 2
+dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
 dnl Public License, this file may be distributed as part of a program
@@ -14,12 +14,12 @@
 
   AC_CACHE_CHECK([whether <inttypes.h> defines strtoumax as a macro],
     jm_cv_func_strtoumax_macro,
-    AC_EGREP_CPP([inttypes_h_defines_strtoumax], [#include <inttypes.h>
+    [AC_EGREP_CPP([inttypes_h_defines_strtoumax], [#include <inttypes.h>
 #ifdef strtoumax
  inttypes_h_defines_strtoumax
 #endif],
-      jm_cv_func_strtoumax_macro=yes,
-      jm_cv_func_strtoumax_macro=no))
+       jm_cv_func_strtoumax_macro=yes,
+       jm_cv_func_strtoumax_macro=no)])
 
   if test "$jm_cv_func_strtoumax_macro" != yes; then
     AC_REPLACE_FUNCS(strtoumax)