Index: m4/fnmatch.m4
===================================================================
CS file: /cvsroot/gnulib/gnulib/m4/fnmatch.m4,v
retrieving revision 1.24
diff -u -r1.24 fnmatch.m4
--- m4/fnmatch.m4	31 Aug 2006 22:29:01 -0000	1.24
+++ m4/fnmatch.m4	22 Sep 2006 03:13:42 -0000
@@ -35,7 +35,7 @@
 	   }
          ],
 	 [exit
-	   (!((fnm ? fnm : fnmatch) ("a*", "", 0) == FNM_NOMATCH
+	   (!(fnm ("a*", "", 0) == FNM_NOMATCH
 	      && y ("a*", "abc", 0)
 	      && n ("d*/*1", "d/s/1", FNM_PATHNAME)
 	      && y ("a\\\\bc", "abc", 0)
Index: m4/strndup.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/strndup.m4,v
retrieving revision 1.9
diff -u -r1.9 strndup.m4
--- m4/strndup.m4	21 Aug 2006 21:46:31 -0000	1.9
+++ m4/strndup.m4	22 Sep 2006 03:13:43 -0000
@@ -1,4 +1,4 @@
-# strndup.m4 serial 8
+# strndup.m4 serial 9
 dnl Copyright (C) 2002-2003, 2005-2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,8 @@
   # AIX 4.3.3, AIX 5.1 have a function that fails to add the terminating '\0'.
   AC_CACHE_CHECK([for working strndup], gl_cv_func_strndup,
     [AC_RUN_IFELSE([
-       AC_LANG_PROGRAM([#include <string.h>], [[
+       AC_LANG_PROGRAM([#include <string.h>
+		 	#include <stdlib.h>], [[
 #ifndef HAVE_DECL_STRNDUP
   extern char *strndup (const char *, size_t);
 #endif