mbsnrtowcs: Move AC_LIBOBJ invocations to module description.

* m4/mbsnrtowcs.m4 (gl_FUNC_MBSNRTOWCS): Move AC_LIBOBJ and
gl_PREREQ_MBSNRTOWCS invocations from here...
* modules/mbsnrtowcs (configure.ac): ... to here.

diff --git a/ChangeLog b/ChangeLog
index 60f0b8c..7a26c22 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2011-05-21  Bruno Haible  <bruno@clisp.org>
 
+       mbsnrtowcs: Move AC_LIBOBJ invocations to module description.
+       * m4/mbsnrtowcs.m4 (gl_FUNC_MBSNRTOWCS): Move AC_LIBOBJ and
+       gl_PREREQ_MBSNRTOWCS invocations from here...
+       * modules/mbsnrtowcs (configure.ac): ... to here.
+
+2011-05-21  Bruno Haible  <bruno@clisp.org>
+
        mbsinit: Move AC_LIBOBJ invocations to module description.
        * m4/mbsinit.m4 (gl_FUNC_MBSINIT): Move AC_LIBOBJ and gl_PREREQ_MBSINIT
        invocations from here...

diff --git a/m4/mbsnrtowcs.m4 b/m4/mbsnrtowcs.m4
index d72942f..28e4921 100644 (file)
--- a/m4/mbsnrtowcs.m4
+++ b/m4/mbsnrtowcs.m4
@@ -1,4 +1,4 @@
-# mbsnrtowcs.m4 serial 3
+# mbsnrtowcs.m4 serial 4
 dnl Copyright (C) 2008, 2010-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,
@@ -22,11 +22,6 @@ AC_DEFUN([gl_FUNC_MBSNRTOWCS],
       REPLACE_MBSNRTOWCS=1
     fi
   fi
-  if test $HAVE_MBSNRTOWCS = 0 || test $REPLACE_MBSNRTOWCS = 1; then
-    AC_LIBOBJ([mbsnrtowcs])
-    AC_LIBOBJ([mbsrtowcs-state])
-    gl_PREREQ_MBSNRTOWCS
-  fi
 ])
 
 # Prerequisites of lib/mbsnrtowcs.c.

diff --git a/modules/mbsnrtowcs b/modules/mbsnrtowcs
index a179296..35ff363 100644 (file)
--- a/modules/mbsnrtowcs
+++ b/modules/mbsnrtowcs
@@ -17,6 +17,11 @@ strnlen1        [test $HAVE_MBSNRTOWCS = 0 || test $REPLACE_MBSNRTOWCS = 1]
 
 configure.ac:
 gl_FUNC_MBSNRTOWCS
+if test $HAVE_MBSNRTOWCS = 0 || test $REPLACE_MBSNRTOWCS = 1; then
+  AC_LIBOBJ([mbsnrtowcs])
+  AC_LIBOBJ([mbsrtowcs-state])
+  gl_PREREQ_MBSNRTOWCS
+fi
 gl_WCHAR_MODULE_INDICATOR([mbsnrtowcs])
 
 Makefile.am: