summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--m4/wctomb.m46
-rw-r--r--modules/wctomb4
3 files changed, 12 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 4e1d228719..d4590aca68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2011-05-22 Bruno Haible <bruno@clisp.org>
+ wctomb: Move AC_LIBOBJ invocations to module description.
+ * m4/wctomb.m4 (gl_FUNC_WCTOMB): Move AC_LIBOBJ and gl_PREREQ_WCTOMB
+ invocations from here...
+ * modules/wctomb (configure.ac): ... to here.
+
+2011-05-22 Bruno Haible <bruno@clisp.org>
+
wctob: Move AC_LIBOBJ invocations to module description.
* m4/wctob.m4 (gl_FUNC_WCTOB): Set HAVE_WCTOB. Move AC_LIBOBJ and
gl_PREREQ_WCTOB invocations from here...
diff --git a/m4/wctomb.m4 b/m4/wctomb.m4
index bc21b5b19f..ee16a7e91f 100644
--- a/m4/wctomb.m4
+++ b/m4/wctomb.m4
@@ -1,4 +1,4 @@
-# wctomb.m4 serial 1
+# wctomb.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_WCTOMB],
if false; then
REPLACE_WCTOMB=1
fi
- if test $REPLACE_WCTOMB = 1; then
- AC_LIBOBJ([wctomb])
- gl_PREREQ_WCTOMB
- fi
])
# Prerequisites of lib/wctomb.c.
diff --git a/modules/wctomb b/modules/wctomb
index 5077005487..00d59bf208 100644
--- a/modules/wctomb
+++ b/modules/wctomb
@@ -13,6 +13,10 @@ wchar [test $REPLACE_WCTOMB = 1]
configure.ac:
gl_FUNC_WCTOMB
+if test $REPLACE_WCTOMB = 1; then
+ AC_LIBOBJ([wctomb])
+ gl_PREREQ_WCTOMB
+fi
gl_STDLIB_MODULE_INDICATOR([wctomb])
Makefile.am: