mbrtowc: Respect rules for use of AC_LIBOBJ.

* m4/mbrtowc.m4 (gl_FUNC_MBRTOWC): Move AC_LIBOBJ and gl_PREREQ_MBRTOWC
invocations from here...
* modules/mbrtowc (configure.ac): ... to here.

diff --git a/ChangeLog b/ChangeLog
index 11a1b8b..791f4a4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2011-05-21  Bruno Haible  <bruno@clisp.org>
 
+       mbrtowc: Respect rules for use of AC_LIBOBJ.
+       * m4/mbrtowc.m4 (gl_FUNC_MBRTOWC): Move AC_LIBOBJ and gl_PREREQ_MBRTOWC
+       invocations from here...
+       * modules/mbrtowc (configure.ac): ... to here.
+
+2011-05-21  Bruno Haible  <bruno@clisp.org>
+
        malloc-*: Move AC_LIBOBJ invocations to module description.
        * m4/malloc.m4 (gl_REPLACE_MALLOC): Remove macro.
        (gl_FUNC_MALLOC_GNU, gl_FUNC_MALLOC_POSIX): Inline it here. Move

diff --git a/m4/mbrtowc.m4 b/m4/mbrtowc.m4
index b5b6aaa..b9e01e7 100644 (file)
--- a/m4/mbrtowc.m4
+++ b/m4/mbrtowc.m4
@@ -1,4 +1,4 @@
-# mbrtowc.m4 serial 23
+# mbrtowc.m4 serial 24
 dnl Copyright (C) 2001-2002, 2004-2005, 2008-2011 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
@@ -53,10 +53,6 @@ AC_DEFUN([gl_FUNC_MBRTOWC],
       esac
     fi
   fi
-  if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then
-    AC_LIBOBJ([mbrtowc])
-    gl_PREREQ_MBRTOWC
-  fi
 ])
 
 dnl Test whether mbsinit() and mbrtowc() need to be overridden in a way that

diff --git a/modules/mbrtowc b/modules/mbrtowc
index 85cde1e..42e8de4 100644 (file)
--- a/modules/mbrtowc
+++ b/modules/mbrtowc
@@ -20,6 +20,10 @@ verify          [test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1]
 
 configure.ac:
 gl_FUNC_MBRTOWC
+if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then
+  AC_LIBOBJ([mbrtowc])
+  gl_PREREQ_MBRTOWC
+fi
 gl_WCHAR_MODULE_INDICATOR([mbrtowc])
 
 Makefile.am: