Mercurial > hg > octave-lyh > gnulib-hg

changeset 15029:cf9240465bb0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mbrtowc: Respect rules for use of AC_LIBOBJ. * m4/mbrtowc.m4 (gl_FUNC_MBRTOWC): Move AC_LIBOBJ and gl_PREREQ_MBRTOWC invocations from here... * modules/mbrtowc (configure.ac): ... to here.
author Bruno Haible <bruno@clisp.org>
date Sat, 21 May 2011 14:15:13 +0200
parents 34c3292ae98c
children c9244e72db26
files ChangeLog m4/mbrtowc.m4 modules/mbrtowc
diffstat 3 files changed, 12 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-21  Bruno Haible  <bruno@clisp.org>
+
+	mbrtowc: Respect rules for use of AC_LIBOBJ.
+	* m4/mbrtowc.m4 (gl_FUNC_MBRTOWC): Move AC_LIBOBJ and gl_PREREQ_MBRTOWC
+	invocations from here...
+	* modules/mbrtowc (configure.ac): ... to here.
+
 2011-05-21  Bruno Haible  <bruno@clisp.org>
 
 	malloc-*: Move AC_LIBOBJ invocations to module description.
--- a/m4/mbrtowc.m4
+++ b/m4/mbrtowc.m4
@@ -1,4 +1,4 @@
-# mbrtowc.m4 serial 23
+# mbrtowc.m4 serial 24
 dnl Copyright (C) 2001-2002, 2004-2005, 2008-2011 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
@@ -53,10 +53,6 @@
       esac
     fi
   fi
-  if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then
-    AC_LIBOBJ([mbrtowc])
-    gl_PREREQ_MBRTOWC
-  fi
 ])
 
 dnl Test whether mbsinit() and mbrtowc() need to be overridden in a way that
--- a/modules/mbrtowc
+++ b/modules/mbrtowc
@@ -20,6 +20,10 @@
 
 configure.ac:
 gl_FUNC_MBRTOWC
+if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then
+  AC_LIBOBJ([mbrtowc])
+  gl_PREREQ_MBRTOWC
+fi
 gl_WCHAR_MODULE_INDICATOR([mbrtowc])
 
 Makefile.am: