X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fstrndup.m4;h=dd5780b6350859e6c151fa86f61525e65670ca33;hb=69d25acfd85067031a54285fb933d2e3ccfb0055;hp=48b15cc03506a54f144c8e90d9933439fe5af9c5;hpb=1d9734dc428383f0573c39c3ee92d84c78b84436;p=gnulib.git

diff --git a/m4/strndup.m4 b/m4/strndup.m4
index 48b15cc03..dd5780b63 100644
--- a/m4/strndup.m4
+++ b/m4/strndup.m4
@@ -1,4 +1,4 @@
-# strndup.m4 serial 6
+# strndup.m4 serial 11
 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,
@@ -6,8 +6,6 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_STRNDUP],
 [
-  AC_LIBSOURCES([strndup.c, strndup.h])
-
   dnl Persuade glibc <string.h> to declare strndup().
   AC_REQUIRE([AC_GNU_SOURCE])
 
@@ -16,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
@@ -27,20 +26,20 @@ 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.])
   else
     AC_LIBOBJ([strndup])
-    AC_DEFINE(strndup, rpl_strndup,
-      [Define to rpl_strndup if the replacement function should be used,])
     gl_PREREQ_STRNDUP
   fi
 ])