summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2011-05-22 12:51:13 +0200
committerBruno Haible <bruno@clisp.org>2011-06-16 00:06:48 +0200
commite3863477ad4175713f36724ee650505d7933877f (patch)
tree212c082aca4ee876b09d721a69350526bc742f75
parent7b5d32ef8bff2910dba4c806a844f61ff41c94d0 (diff)
downloadgnulib-e3863477ad4175713f36724ee650505d7933877f.tar.gz
stpncpy: Move AC_LIBOBJ invocations to module description.
* m4/stpncpy.m4 (gl_FUNC_STPNCPY): Move AC_LIBOBJ invocations from here... * modules/stpncpy (configure.ac): ... to here.
-rw-r--r--ChangeLog7
-rw-r--r--m4/stpncpy.m46
-rw-r--r--modules/stpncpy4
3 files changed, 12 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 93b2ddf411..ed3e21f564 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2011-05-22 Bruno Haible <bruno@clisp.org>
+ stpncpy: Move AC_LIBOBJ invocations to module description.
+ * m4/stpncpy.m4 (gl_FUNC_STPNCPY): Move AC_LIBOBJ invocations from
+ here...
+ * modules/stpncpy (configure.ac): ... to here.
+
+2011-05-22 Bruno Haible <bruno@clisp.org>
+
stpcpy: Move AC_LIBOBJ invocations to module description.
* m4/stpcpy.m4 (gl_FUNC_STPCPY): Call AC_CHECK_FUNCS instead of
AC_REPLACE_FUNCS. Move AC_LIBOBJ and gl_PREREQ_STPCPY invocations from
diff --git a/m4/stpncpy.m4 b/m4/stpncpy.m4
index cc7796a559..9c9b77be49 100644
--- a/m4/stpncpy.m4
+++ b/m4/stpncpy.m4
@@ -1,4 +1,4 @@
-# stpncpy.m4 serial 13
+# stpncpy.m4 serial 14
dnl Copyright (C) 2002-2003, 2005-2007, 2009-2011 Free Software Foundation,
dnl Inc.
dnl This file is free software; the Free Software Foundation
@@ -78,13 +78,9 @@ int main ()
[Define if you have the stpncpy() function and it works.])
else
REPLACE_STPNCPY=1
- AC_LIBOBJ([stpncpy])
- gl_PREREQ_STPNCPY
fi
else
HAVE_STPNCPY=0
- AC_LIBOBJ([stpncpy])
- gl_PREREQ_STPNCPY
fi
])
diff --git a/modules/stpncpy b/modules/stpncpy
index ccbd253707..cfad9aabc9 100644
--- a/modules/stpncpy
+++ b/modules/stpncpy
@@ -11,6 +11,10 @@ string
configure.ac:
gl_FUNC_STPNCPY
+if test $HAVE_STPNCPY = 0 || test $REPLACE_STPNCPY = 1; then
+ AC_LIBOBJ([stpncpy])
+ gl_PREREQ_STPNCPY
+fi
gl_STRING_MODULE_INDICATOR([stpncpy])
Makefile.am: