Mercurial > hg > octave-lojdl > gnulib-hg

changeset 15030:c9244e72db26

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mbrlen: Move AC_LIBOBJ invocations to module description. * m4/mbrlen.m4 (gl_FUNC_MBRLEN): Move AC_LIBOBJ and gl_PREREQ_MBRLEN invocations from here... * modules/mbrlen (configure.ac): ... to here.
author Bruno Haible <bruno@clisp.org>
date Sat, 21 May 2011 14:17:23 +0200
parents cf9240465bb0
children cec7c0e3ddcc
files ChangeLog m4/mbrlen.m4 modules/mbrlen
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>
+
+	mbrlen: Move AC_LIBOBJ invocations to module description.
+	* m4/mbrlen.m4 (gl_FUNC_MBRLEN): Move AC_LIBOBJ and gl_PREREQ_MBRLEN
+	invocations from here...
+	* modules/mbrlen (configure.ac): ... to here.
+
 2011-05-21  Bruno Haible  <bruno@clisp.org>
 
 	mbrtowc: Respect rules for use of AC_LIBOBJ.
--- a/m4/mbrlen.m4
+++ b/m4/mbrlen.m4
@@ -1,4 +1,4 @@
-# mbrlen.m4 serial 6
+# mbrlen.m4 serial 7
 dnl Copyright (C) 2008, 2010-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,
@@ -22,10 +22,6 @@
       REPLACE_MBRLEN=1
     fi
   fi
-  if test $HAVE_MBRLEN = 0 || test $REPLACE_MBRLEN = 1; then
-    AC_LIBOBJ([mbrlen])
-    gl_PREREQ_MBRLEN
-  fi
 ])
 
 dnl Test whether mbrlen puts the state into non-initial state when parsing an
--- a/modules/mbrlen
+++ b/modules/mbrlen
@@ -13,6 +13,10 @@
 
 configure.ac:
 gl_FUNC_MBRLEN
+if test $HAVE_MBRLEN = 0 || test $REPLACE_MBRLEN = 1; then
+  AC_LIBOBJ([mbrlen])
+  gl_PREREQ_MBRLEN
+fi
 gl_WCHAR_MODULE_INDICATOR([mbrlen])
 
 Makefile.am: