From: Bruno Haible <bruno@clisp.org>
Date: Sat, 21 May 2011 12:27:19 +0000 (+0200)
Subject: mbtowc: Move AC_LIBOBJ invocations to module description.
X-Git-Tag: v0.1~2492
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=bc04f8f55f384cbe7682f13699b6d584c9a4c56f;p=gnulib.git

mbtowc: Move AC_LIBOBJ invocations to module description.

* m4/mbtowc.m4 (gl_FUNC_MBTOWC): Move AC_LIBOBJ and gl_PREREQ_MBTOWC
invocations from here...
* modules/mbtowc (configure.ac): ... to here.
---

diff --git a/ChangeLog b/ChangeLog
index b017548c5..af0d43ea8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2011-05-21  Bruno Haible  <bruno@clisp.org>
 
+	mbtowc: Move AC_LIBOBJ invocations to module description.
+	* m4/mbtowc.m4 (gl_FUNC_MBTOWC): Move AC_LIBOBJ and gl_PREREQ_MBTOWC
+	invocations from here...
+	* modules/mbtowc (configure.ac): ... to here.
+
+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...
diff --git a/m4/mbtowc.m4 b/m4/mbtowc.m4
index 9215892f6..7793a0071 100644
--- a/m4/mbtowc.m4
+++ b/m4/mbtowc.m4
@@ -1,4 +1,4 @@
-# mbtowc.m4 serial 1
+# mbtowc.m4 serial 2
 dnl Copyright (C) 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,
@@ -11,10 +11,6 @@ AC_DEFUN([gl_FUNC_MBTOWC],
   if false; then
     REPLACE_MBTOWC=1
   fi
-  if test $REPLACE_MBTOWC = 1; then
-    AC_LIBOBJ([mbtowc])
-    gl_PREREQ_MBTOWC
-  fi
 ])
 
 # Prerequisites of lib/mbtowc.c.
diff --git a/modules/mbtowc b/modules/mbtowc
index 02b0c88dc..c23323b3e 100644
--- a/modules/mbtowc
+++ b/modules/mbtowc
@@ -13,6 +13,10 @@ wchar           [test $REPLACE_MBTOWC = 1]
 
 configure.ac:
 gl_FUNC_MBTOWC
+if test $REPLACE_MBTOWC = 1; then
+  AC_LIBOBJ([mbtowc])
+  gl_PREREQ_MBTOWC
+fi
 gl_STDLIB_MODULE_INDICATOR([mbtowc])
 
 Makefile.am: