* fnmatch.m4 (_AC_FUNC_FNMATCH_IF): Avoid expression that is

always true.
* strndup.m4 (gl_FUNC_STRNDUP): include stdlib.h, for `free'.

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 0dee0e4..dc60ca7 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,5 +1,9 @@
 2006-09-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       * fnmatch.m4 (_AC_FUNC_FNMATCH_IF): Avoid expression that is
+       always true.
+       * strndup.m4 (gl_FUNC_STRNDUP): include stdlib.h, for `free'.
+
        * sockpfaf.m4 (gl_SOCKET_FAMILIES): Avoid gcc -Wall warnings.
 
 2006-09-17  Bruno Haible  <bruno@clisp.org>

diff --git a/m4/fnmatch.m4 b/m4/fnmatch.m4
index d638f67..9aeaeb5 100644 (file)
--- a/m4/fnmatch.m4
+++ b/m4/fnmatch.m4
@@ -35,7 +35,7 @@ AC_DEFUN([_AC_FUNC_FNMATCH_IF],
           }
          ],
         [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)

diff --git a/m4/strndup.m4 b/m4/strndup.m4
index 180ad20..75d301b 100644 (file)
--- a/m4/strndup.m4
+++ b/m4/strndup.m4
@@ -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 @@ AC_DEFUN([gl_FUNC_STRNDUP],
   # 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