wcsnrtombs: Move AC_LIBOBJ invocations to module description.

* m4/wcsnrtombs.m4 (gl_FUNC_WCSNRTOMBS): Move AC_LIBOBJ and
gl_PREREQ_WCSNRTOMBS invocations from here...
* modules/wcsnrtombs (configure.ac): ... to here.

diff --git a/ChangeLog b/ChangeLog
index f1c35cd..be4216f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2011-05-22  Bruno Haible  <bruno@clisp.org>
 
+       wcsnrtombs: Move AC_LIBOBJ invocations to module description.
+       * m4/wcsnrtombs.m4 (gl_FUNC_WCSNRTOMBS): Move AC_LIBOBJ and
+       gl_PREREQ_WCSNRTOMBS invocations from here...
+       * modules/wcsnrtombs (configure.ac): ... to here.
+
+2011-05-22  Bruno Haible  <bruno@clisp.org>
+
        wcsnlen: Move AC_LIBOBJ invocations to module description.
        * m4/wcsnlen.m4 (gl_FUNC_WCSNLEN): Move AC_LIBOBJ invocation from
        here...

diff --git a/m4/wcsnrtombs.m4 b/m4/wcsnrtombs.m4
index ba61129..d1fac8c 100644 (file)
--- a/m4/wcsnrtombs.m4
+++ b/m4/wcsnrtombs.m4
@@ -1,4 +1,4 @@
-# wcsnrtombs.m4 serial 4
+# wcsnrtombs.m4 serial 5
 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,
@@ -19,11 +19,6 @@ AC_DEFUN([gl_FUNC_WCSNRTOMBS],
       REPLACE_WCSNRTOMBS=1
     fi
   fi
-  if test $HAVE_WCSNRTOMBS = 0 || test $REPLACE_WCSNRTOMBS = 1; then
-    AC_LIBOBJ([wcsnrtombs])
-    AC_LIBOBJ([wcsrtombs-state])
-    gl_PREREQ_WCSNRTOMBS
-  fi
 ])
 
 # Prerequisites of lib/wcsnrtombs.c.

diff --git a/modules/wcsnrtombs b/modules/wcsnrtombs
index 3582ae5..63103f4 100644 (file)
--- a/modules/wcsnrtombs
+++ b/modules/wcsnrtombs
@@ -19,6 +19,11 @@ wcrtomb         [test $HAVE_WCSNRTOMBS = 0 || test $REPLACE_WCSNRTOMBS = 1]
 
 configure.ac:
 gl_FUNC_WCSNRTOMBS
+if test $HAVE_WCSNRTOMBS = 0 || test $REPLACE_WCSNRTOMBS = 1; then
+  AC_LIBOBJ([wcsnrtombs])
+  AC_LIBOBJ([wcsrtombs-state])
+  gl_PREREQ_WCSNRTOMBS
+fi
 gl_WCHAR_MODULE_INDICATOR([wcsnrtombs])
 
 Makefile.am: