mbtowc: Move AC_LIBOBJ invocations to module description.

* m4/mbtowc.m4 (gl_FUNC_MBTOWC): Move AC_LIBOBJ and gl_PREREQ_MBTOWC
invocations from here...
* modules/mbtowc (configure.ac): ... to here.

diff --git a/ChangeLog b/ChangeLog
index b017548..af0d43e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2011-05-21  Bruno Haible  <bruno@clisp.org>
 
+       mbtowc: Move AC_LIBOBJ invocations to module description.
+       * m4/mbtowc.m4 (gl_FUNC_MBTOWC): Move AC_LIBOBJ and gl_PREREQ_MBTOWC
+       invocations from here...
+       * modules/mbtowc (configure.ac): ... to here.
+
+2011-05-21  Bruno Haible  <bruno@clisp.org>
+
        mbsrtowcs: Move AC_LIBOBJ invocations to module description.
        * m4/mbsrtowcs.m4 (gl_FUNC_MBSRTOWCS): Move AC_LIBOBJ and
        gl_PREREQ_MBSRTOWCS invocations from here...

diff --git a/m4/mbtowc.m4 b/m4/mbtowc.m4
index 9215892..7793a00 100644 (file)
--- a/m4/mbtowc.m4
+++ b/m4/mbtowc.m4
@@ -1,4 +1,4 @@
-# mbtowc.m4 serial 1
+# mbtowc.m4 serial 2
 dnl Copyright (C) 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,
@@ -11,10 +11,6 @@ AC_DEFUN([gl_FUNC_MBTOWC],
   if false; then
     REPLACE_MBTOWC=1
   fi
-  if test $REPLACE_MBTOWC = 1; then
-    AC_LIBOBJ([mbtowc])
-    gl_PREREQ_MBTOWC
-  fi
 ])
 
 # Prerequisites of lib/mbtowc.c.

diff --git a/modules/mbtowc b/modules/mbtowc
index 02b0c88..c23323b 100644 (file)
--- a/modules/mbtowc
+++ b/modules/mbtowc
@@ -13,6 +13,10 @@ wchar           [test $REPLACE_MBTOWC = 1]
 
 configure.ac:
 gl_FUNC_MBTOWC
+if test $REPLACE_MBTOWC = 1; then
+  AC_LIBOBJ([mbtowc])
+  gl_PREREQ_MBTOWC
+fi
 gl_STDLIB_MODULE_INDICATOR([mbtowc])
 
 Makefile.am: