wcrtomb: Move AC_LIBOBJ invocations to module description.

* m4/wcrtomb.m4 (gl_FUNC_WCRTOMB): Move AC_LIBOBJ and gl_PREREQ_WCRTOMB
invocations from here...
* modules/wcrtomb (configure.ac): ... to here.

diff --git a/ChangeLog b/ChangeLog
index 948be57..b8b2a5d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2011-05-22  Bruno Haible  <bruno@clisp.org>
 
+       wcrtomb: Move AC_LIBOBJ invocations to module description.
+       * m4/wcrtomb.m4 (gl_FUNC_WCRTOMB): Move AC_LIBOBJ and gl_PREREQ_WCRTOMB
+       invocations from here...
+       * modules/wcrtomb (configure.ac): ... to here.
+
+2011-05-22  Bruno Haible  <bruno@clisp.org>
+
        wcpncpy: Move AC_LIBOBJ invocations to module description.
        * m4/wcpncpy.m4 (gl_FUNC_WCPNCPY): Move AC_LIBOBJ invocation from
        here...

diff --git a/m4/wcrtomb.m4 b/m4/wcrtomb.m4
index 4f58e3f..d21f1b9 100644 (file)
--- a/m4/wcrtomb.m4
+++ b/m4/wcrtomb.m4
@@ -1,4 +1,4 @@
-# wcrtomb.m4 serial 9
+# wcrtomb.m4 serial 10
 dnl Copyright (C) 2008-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,
@@ -88,10 +88,6 @@ int main ()
       esac
     fi
   fi
-  if test $HAVE_WCRTOMB = 0 || test $REPLACE_WCRTOMB = 1; then
-    AC_LIBOBJ([wcrtomb])
-    gl_PREREQ_WCRTOMB
-  fi
 ])
 
 # Prerequisites of lib/wcrtomb.c.

diff --git a/modules/wcrtomb b/modules/wcrtomb
index f9fea15..184fc53 100644 (file)
--- a/modules/wcrtomb
+++ b/modules/wcrtomb
@@ -18,6 +18,10 @@ mbsinit         [test $HAVE_WCRTOMB = 0 || test $REPLACE_WCRTOMB = 1]
 
 configure.ac:
 gl_FUNC_WCRTOMB
+if test $HAVE_WCRTOMB = 0 || test $REPLACE_WCRTOMB = 1; then
+  AC_LIBOBJ([wcrtomb])
+  gl_PREREQ_WCRTOMB
+fi
 gl_WCHAR_MODULE_INDICATOR([wcrtomb])
 
 Makefile.am: