wcsrtombs: Move AC_LIBOBJ invocations to module description.

* m4/wcsrtombs.m4 (gl_FUNC_WCSRTOMBS): Move AC_LIBOBJ and
gl_PREREQ_WCSRTOMBS invocations from here...
* modules/wcsrtombs (configure.ac): ... to here.

diff --git a/ChangeLog b/ChangeLog
index 8b306c4d5336926cc03491cd1c2114807b29f6ed..1f4f3216f68c5efae2f62547297d8c91e4ffa4ed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-22  Bruno Haible  <bruno@clisp.org>
+
+       wcsrtombs: Move AC_LIBOBJ invocations to module description.
+       * m4/wcsrtombs.m4 (gl_FUNC_WCSRTOMBS): Move AC_LIBOBJ and
+       gl_PREREQ_WCSRTOMBS invocations from here...
+       * modules/wcsrtombs (configure.ac): ... to here.
+
 2011-05-22  Bruno Haible  <bruno@clisp.org>
 
        wcsrchr: Move AC_LIBOBJ invocations to module description.

diff --git a/m4/wcsrtombs.m4 b/m4/wcsrtombs.m4
index cd51506a2b8864ab801e0a5c3352532ec2cb7c68..7ce575961571b10ef2c8158e07cfe5c8290aad94 100644 (file)
--- a/m4/wcsrtombs.m4
+++ b/m4/wcsrtombs.m4
@@ -1,4 +1,4 @@
-# wcsrtombs.m4 serial 9
+# wcsrtombs.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,
@@ -34,11 +34,6 @@ AC_DEFUN([gl_FUNC_WCSRTOMBS],
       esac
     fi
   fi
-  if test $HAVE_WCSRTOMBS = 0 || test $REPLACE_WCSRTOMBS = 1; then
-    AC_LIBOBJ([wcsrtombs])
-    AC_LIBOBJ([wcsrtombs-state])
-    gl_PREREQ_WCSRTOMBS
-  fi
 ])
 
 dnl Test whether the wcsrtombs implementation stores a non-NULL source pointer

diff --git a/modules/wcsrtombs b/modules/wcsrtombs
index 49c05039535bda07637ea72cb5498e83612f2a2a..b61ac34f7c2901b837f5d0f8419e75fe22a02046 100644 (file)
--- a/modules/wcsrtombs
+++ b/modules/wcsrtombs
@@ -20,6 +20,11 @@ wcrtomb         [test $HAVE_WCSRTOMBS = 0 || test $REPLACE_WCSRTOMBS = 1]
 
 configure.ac:
 gl_FUNC_WCSRTOMBS
+if test $HAVE_WCSRTOMBS = 0 || test $REPLACE_WCSRTOMBS = 1; then
+  AC_LIBOBJ([wcsrtombs])
+  AC_LIBOBJ([wcsrtombs-state])
+  gl_PREREQ_WCSRTOMBS
+fi
 gl_WCHAR_MODULE_INDICATOR([wcsrtombs])
 
 Makefile.am: