strerror_r-posix: Respect rules for use of AC_LIBOBJ.

* m4/strerror_r.m4 (gl_FUNC_STRERROR_R): Move AC_LIBOBJ and
gl_PREREQ_STRERROR_R invocations from here...
* modules/strerror_r-posix (configure.ac): ... to here.

diff --git a/ChangeLog b/ChangeLog
index 3dc7091aff78f1fd29990644c8b9fe415351fc67..1f0ac8b198b72fe89d13626bd173b9ab5b16ced2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-24  Bruno Haible  <bruno@clisp.org>
+
+       strerror_r-posix: Respect rules for use of AC_LIBOBJ.
+       * m4/strerror_r.m4 (gl_FUNC_STRERROR_R): Move AC_LIBOBJ and
+       gl_PREREQ_STRERROR_R invocations from here...
+       * modules/strerror_r-posix (configure.ac): ... to here.
+
 2011-05-24  Eric Blake  <eblake@redhat.com>
 
        strerror_r: fix missing header

diff --git a/m4/strerror_r.m4 b/m4/strerror_r.m4
index ddaf10f5263dff6da164c236896266290209f9bc..1c0af3691dc0f7b01dffcc6020835d0e7d8f6847 100644 (file)
--- a/m4/strerror_r.m4
+++ b/m4/strerror_r.m4
@@ -1,4 +1,4 @@
-# strerror_r.m4 serial 8
+# strerror_r.m4 serial 9
 dnl Copyright (C) 2002, 2007-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,
@@ -100,10 +100,6 @@ changequote([,])dnl
       REPLACE_STRERROR_R=1
     fi
   fi
-  if test $HAVE_DECL_STRERROR_R = 0 || test $REPLACE_STRERROR_R = 1; then
-    AC_LIBOBJ([strerror_r])
-    gl_PREREQ_STRERROR_R
-  fi
 ])
 
 # Prerequisites of lib/strerror_r.c.

diff --git a/modules/strerror_r-posix b/modules/strerror_r-posix
index a36f2e6f948449d35baaa8a258c753fdabc75f7e..90c98064a3421d2d2e5b9891e6e3d3858247ce7c 100644 (file)
--- a/modules/strerror_r-posix
+++ b/modules/strerror_r-posix
@@ -13,6 +13,10 @@ lock            [test $HAVE_DECL_STRERROR_R = 0 || test $REPLACE_STRERROR_R = 1]
 
 configure.ac:
 gl_FUNC_STRERROR_R
+if test $HAVE_DECL_STRERROR_R = 0 || test $REPLACE_STRERROR_R = 1; then
+  AC_LIBOBJ([strerror_r])
+  gl_PREREQ_STRERROR_R
+fi
 gl_STRING_MODULE_INDICATOR([strerror_r])
 
 Makefile.am: