mbsrtowcs: Move AC_LIBOBJ invocations to module description.

* m4/mbsrtowcs.m4 (gl_FUNC_MBSRTOWCS): Move AC_LIBOBJ and
gl_PREREQ_MBSRTOWCS invocations from here...
* modules/mbsrtowcs (configure.ac): ... to here.

diff --git a/ChangeLog b/ChangeLog
index 7a26c22b4fe07363081d28cc64a62461a952f2b5..b017548c5f3e75d856ec10ace756ba9639080143 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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...
+       * modules/mbsrtowcs (configure.ac): ... to here.
+
 2011-05-21  Bruno Haible  <bruno@clisp.org>
 
        mbsnrtowcs: Move AC_LIBOBJ invocations to module description.

diff --git a/m4/mbsrtowcs.m4 b/m4/mbsrtowcs.m4
index 4410741d7839e6ff17ffaf23c8d2d2054e8db9e5..025198a91dc380e7d1a4cecbe126ec186cbb50f4 100644 (file)
--- a/m4/mbsrtowcs.m4
+++ b/m4/mbsrtowcs.m4
@@ -1,4 +1,4 @@
-# mbsrtowcs.m4 serial 11
+# mbsrtowcs.m4 serial 12
 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,
@@ -25,11 +25,6 @@ AC_DEFUN([gl_FUNC_MBSRTOWCS],
       esac
     fi
   fi
-  if test $HAVE_MBSRTOWCS = 0 || test $REPLACE_MBSRTOWCS = 1; then
-    AC_LIBOBJ([mbsrtowcs])
-    AC_LIBOBJ([mbsrtowcs-state])
-    gl_PREREQ_MBSRTOWCS
-  fi
 ])
 
 dnl Test whether mbsrtowcs works.

diff --git a/modules/mbsrtowcs b/modules/mbsrtowcs
index 66dd78f67b6c027ec0a7775c65c4ca5978f83e97..da5f016e44d7bb518cc28465024e8115859619f6 100644 (file)
--- a/modules/mbsrtowcs
+++ b/modules/mbsrtowcs
@@ -20,6 +20,11 @@ strnlen1        [test $HAVE_MBSRTOWCS = 0 || test $REPLACE_MBSRTOWCS = 1]
 
 configure.ac:
 gl_FUNC_MBSRTOWCS
+if test $HAVE_MBSRTOWCS = 0 || test $REPLACE_MBSRTOWCS = 1; then
+  AC_LIBOBJ([mbsrtowcs])
+  AC_LIBOBJ([mbsrtowcs-state])
+  gl_PREREQ_MBSRTOWCS
+fi
 gl_WCHAR_MODULE_INDICATOR([mbsrtowcs])
 
 Makefile.am: