Fix for cross-compilation.

diff --git a/m4/ChangeLog b/m4/ChangeLog
index d11fddef55352aca867050e5223ce1aafb45f054..03111167927979eeac0828ecaf5a37f1410d13f8 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-03  Bruno Haible  <bruno@clisp.org>
+
+       * strndup.m4 (gl_FUNC_STRNDUP): When cross-compiling, check whether
+       the function exists, before testing against AIX.
+       Reported by Martin Lambers <marlam@marlam.de>.
+
 2006-07-04  Paul Eggert  <eggert@cs.ucla.edu>
 
        * absolute-header.m4 (gl_ABSOLUTE_HEADER): Prepend three slashes

diff --git a/m4/strndup.m4 b/m4/strndup.m4
index 48b15cc03506a54f144c8e90d9933439fe5af9c5..e333f5cfdb59e390862209ad0edcb779e9284d9d 100644 (file)
--- a/m4/strndup.m4
+++ b/m4/strndup.m4
@@ -1,4 +1,4 @@
-# strndup.m4 serial 6
+# strndup.m4 serial 7
 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,
@@ -27,13 +27,15 @@ AC_DEFUN([gl_FUNC_STRNDUP],
   return s[13] != '\0';]])],
        [gl_cv_func_strndup=yes],
        [gl_cv_func_strndup=no],
-       [AC_EGREP_CPP([too risky], [
+       [AC_CHECK_FUNC([strndup],
+          [AC_EGREP_CPP([too risky], [
 #ifdef _AIX
-            too risky
+               too risky
 #endif
-          ],
-          [gl_cv_func_strndup=no],
-          [gl_cv_func_strndup=yes])])])
+             ],
+             [gl_cv_func_strndup=no],
+             [gl_cv_func_strndup=yes])],
+          [gl_cv_func_strndup=no])])])
   if test $gl_cv_func_strndup = yes; then
     AC_DEFINE([HAVE_STRNDUP], 1,
       [Define if you have the strndup() function and it works.])