Mercurial > hg > octave-lojdl > gnulib-hg

changeset 15104:037e4c930d72

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
strdup, strdup-posix: Move AC_LIBOBJ invocations to module description. * m4/strdup.m4 (gl_FUNC_STRDUP): Move AC_LIBOBJ and gl_PREREQ_STRDUP invocations from here... * modules/strdup (configure.ac): ... to here. * modules/strdup-posix (configure.ac): ... and here.
author Bruno Haible <bruno@clisp.org>
date Sun, 22 May 2011 13:16:19 +0200
parents c169efecd827
children b93f270fadba
files ChangeLog m4/strdup.m4 modules/strdup modules/strdup-posix
diffstat 4 files changed, 17 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-22  Bruno Haible  <bruno@clisp.org>
+
+	strdup, strdup-posix: Move AC_LIBOBJ invocations to module description.
+	* m4/strdup.m4 (gl_FUNC_STRDUP): Move AC_LIBOBJ and gl_PREREQ_STRDUP
+	invocations from here...
+	* modules/strdup (configure.ac): ... to here.
+	* modules/strdup-posix (configure.ac): ... and here.
+
 2011-05-22  Bruno Haible  <bruno@clisp.org>
 
 	strcspn: Move AC_LIBOBJ invocations to module description.
--- a/m4/strdup.m4
+++ b/m4/strdup.m4
@@ -1,4 +1,4 @@
-# strdup.m4 serial 12
+# strdup.m4 serial 13
 
 dnl Copyright (C) 2002-2011 Free Software Foundation, Inc.
 
@@ -10,10 +10,6 @@
 [
   AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
   AC_CHECK_FUNCS_ONCE([strdup])
-  if test $ac_cv_func_strdup != yes; then
-    AC_LIBOBJ([strdup])
-    gl_PREREQ_STRDUP
-  fi
   AC_CHECK_DECLS_ONCE([strdup])
   if test $ac_cv_have_decl_strdup = no; then
     HAVE_DECL_STRDUP=0
@@ -28,12 +24,7 @@
   if test $ac_cv_func_strdup = yes; then
     if test $gl_cv_func_malloc_posix != yes; then
       REPLACE_STRDUP=1
-      AC_LIBOBJ([strdup])
-      gl_PREREQ_STRDUP
     fi
-  else
-    AC_LIBOBJ([strdup])
-    gl_PREREQ_STRDUP
   fi
   AC_CHECK_DECLS_ONCE([strdup])
   if test $ac_cv_have_decl_strdup = no; then
--- a/modules/strdup
+++ b/modules/strdup
@@ -16,6 +16,10 @@
 
 configure.ac:
 gl_FUNC_STRDUP
+if test $ac_cv_func_strdup = no; then
+  AC_LIBOBJ([strdup])
+  gl_PREREQ_STRDUP
+fi
 gl_STRING_MODULE_INDICATOR([strdup])
 
 Makefile.am:
--- a/modules/strdup-posix
+++ b/modules/strdup-posix
@@ -11,6 +11,10 @@
 
 configure.ac:
 gl_FUNC_STRDUP_POSIX
+if test $ac_cv_func_strdup = no || test $REPLACE_STRDUP = 1; then
+  AC_LIBOBJ([strdup])
+  gl_PREREQ_STRDUP
+fi
 gl_STRING_MODULE_INDICATOR([strdup])
 
 Makefile.am: