summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--m4/wmemchr.m43
-rw-r--r--modules/wmemchr3
3 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5a7100c08d..cc08662a7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2011-05-22 Bruno Haible <bruno@clisp.org>
+ wmemchr: Move AC_LIBOBJ invocations to module description.
+ * m4/wmemchr.m4 (gl_FUNC_WMEMCHR): Move AC_LIBOBJ invocation from
+ here...
+ * modules/wmemchr (configure.ac): ... to here.
+
+2011-05-22 Bruno Haible <bruno@clisp.org>
+
wcswidth: Move AC_LIBOBJ invocations to module description.
* m4/wcswidth.m4 (gl_FUNC_WCSWIDTH): Move AC_LIBOBJ invocation from
here...
diff --git a/m4/wmemchr.m4 b/m4/wmemchr.m4
index b2a2052918..2853045305 100644
--- a/m4/wmemchr.m4
+++ b/m4/wmemchr.m4
@@ -1,4 +1,4 @@
-# wmemchr.m4 serial 1
+# wmemchr.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,
@@ -10,6 +10,5 @@ AC_DEFUN([gl_FUNC_WMEMCHR],
AC_CHECK_FUNCS_ONCE([wmemchr])
if test $ac_cv_func_wmemchr = no; then
HAVE_WMEMCHR=0
- AC_LIBOBJ([wmemchr])
fi
])
diff --git a/modules/wmemchr b/modules/wmemchr
index e50e62d7f4..d34903cc76 100644
--- a/modules/wmemchr
+++ b/modules/wmemchr
@@ -11,6 +11,9 @@ wchar
configure.ac:
gl_FUNC_WMEMCHR
+if test $HAVE_WMEMCHR = 0; then
+ AC_LIBOBJ([wmemchr])
+fi
gl_WCHAR_MODULE_INDICATOR([wmemchr])
Makefile.am: