From 5ad9e4b03ed0569378cbb2f29b0c3283f1bbd9c5 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sun, 22 May 2011 13:32:55 +0200
Subject: [PATCH] strndup: Move AC_LIBOBJ invocations to module description.

* m4/strndup.m4 (gl_FUNC_STRNDUP): Set HAVE_STRNDUP. Move AC_LIBOBJ
invocations from here...
* modules/strndup (configure.ac): ... to here.
(Depends-on): Update conditions.
---
 ChangeLog       |  8 ++++++++
 m4/strndup.m4   | 10 ++++------
 modules/strndup |  5 ++++-
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6e338a673a..4a9a8902ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-22  Bruno Haible  <bruno@clisp.org>
+
+	strndup: Move AC_LIBOBJ invocations to module description.
+	* m4/strndup.m4 (gl_FUNC_STRNDUP): Set HAVE_STRNDUP. Move AC_LIBOBJ
+	invocations from here...
+	* modules/strndup (configure.ac): ... to here.
+	(Depends-on): Update conditions.
+
 2011-05-22  Bruno Haible  <bruno@clisp.org>
 
 	strncat: Move AC_LIBOBJ invocations to module description.
diff --git a/m4/strndup.m4 b/m4/strndup.m4
index d8f00caba7..969e3191a4 100644
--- a/m4/strndup.m4
+++ b/m4/strndup.m4
@@ -1,4 +1,4 @@
-# strndup.m4 serial 18
+# strndup.m4 serial 19
 dnl Copyright (C) 2002-2003, 2005-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -18,6 +18,7 @@ AC_DEFUN([gl_FUNC_STRNDUP],
   fi
 
   if test $ac_cv_func_strndup = yes; then
+    HAVE_STRNDUP=1
     # 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_works],
       [AC_RUN_IFELSE([
@@ -42,12 +43,9 @@ changequote(,)dnl
 changequote([,])dnl
          ])])
     case $gl_cv_func_strndup_works in
-      *no)
-        REPLACE_STRNDUP=1
-        AC_LIBOBJ([strndup])
-        ;;
+      *no) REPLACE_STRNDUP=1 ;;
     esac
   else
-    AC_LIBOBJ([strndup])
+    HAVE_STRNDUP=0
   fi
 ])
diff --git a/modules/strndup b/modules/strndup
index c76e966a57..4cb5a903c5 100644
--- a/modules/strndup
+++ b/modules/strndup
@@ -8,10 +8,13 @@ m4/strndup.m4
 Depends-on:
 string
 extensions
-strnlen         [test $ac_cv_func_strndup = no || test $REPLACE_STRNDUP = 1]
+strnlen         [test $HAVE_STRNDUP = 0 || test $REPLACE_STRNDUP = 1]
 
 configure.ac:
 gl_FUNC_STRNDUP
+if test $HAVE_STRNDUP = 0 || test $REPLACE_STRNDUP = 1; then
+  AC_LIBOBJ([strndup])
+fi
 gl_STRING_MODULE_INDICATOR([strndup])
 
 Makefile.am:
-- 
2.30.2