Mercurial > hg > octave-lojdl > gnulib-hg

changeset 15168:6a22832c8bd6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
wcswidth: Move AC_LIBOBJ invocations to module description. * m4/wcswidth.m4 (gl_FUNC_WCSWIDTH): Move AC_LIBOBJ invocation from here... * modules/wcswidth (configure.ac): ... to here.
author Bruno Haible <bruno@clisp.org>
date Sun, 22 May 2011 19:00:44 +0200
parents 570b3db43160
children 66e9b74a4b8e
files ChangeLog m4/wcswidth.m4 modules/wcswidth
diffstat 3 files changed, 11 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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...
+	* modules/wcswidth (configure.ac): ... to here.
+
 2011-05-22  Bruno Haible  <bruno@clisp.org>
 
 	wcwidth: Respect rules for use of AC_LIBOBJ.
--- a/m4/wcswidth.m4
+++ b/m4/wcswidth.m4
@@ -1,4 +1,4 @@
-# wcswidth.m4 serial 1
+# wcswidth.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,
@@ -18,7 +18,4 @@
       REPLACE_WCSWIDTH=1
     fi
   fi
-  if test $HAVE_WCSWIDTH = 0 || test $REPLACE_WCSWIDTH = 1; then
-    AC_LIBOBJ([wcswidth])
-  fi
 ])
--- a/modules/wcswidth
+++ b/modules/wcswidth
@@ -13,6 +13,9 @@
 
 configure.ac:
 gl_FUNC_WCSWIDTH
+if test $HAVE_WCSWIDTH = 0 || test $REPLACE_WCSWIDTH = 1; then
+  AC_LIBOBJ([wcswidth])
+fi
 gl_WCHAR_MODULE_INDICATOR([wcswidth])
 
 Makefile.am: