Mercurial > hg > octave-lojdl > gnulib-hg

changeset 15166:e657c0244ac1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
wctype: Move AC_LIBOBJ invocations to module description. * m4/wctype.m4 (gl_FUNC_WCTYPE): Set HAVE_WCTYPE. Move AC_LIBOBJ invocation from here... * modules/wctype (configure.ac): ... to here. (Depends-on): Update conditions.
author Bruno Haible <bruno@clisp.org>
date Sun, 22 May 2011 18:53:14 +0200
parents 2f44e6e0e98b
children 570b3db43160
files ChangeLog m4/wctype.m4 modules/wctype
diffstat 3 files changed, 14 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-22  Bruno Haible  <bruno@clisp.org>
+
+	wctype: Move AC_LIBOBJ invocations to module description.
+	* m4/wctype.m4 (gl_FUNC_WCTYPE): Set HAVE_WCTYPE. Move AC_LIBOBJ
+	invocation from here...
+	* modules/wctype (configure.ac): ... to here.
+	(Depends-on): Update conditions.
+
 2011-05-22  Bruno Haible  <bruno@clisp.org>
 
 	wctrans: Move AC_LIBOBJ invocations to module description.
--- a/m4/wctype.m4
+++ b/m4/wctype.m4
@@ -1,4 +1,4 @@
-# wctype.m4 serial 1
+# wctype.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,
@@ -8,7 +8,5 @@
 [
   AC_REQUIRE([gl_WCTYPE_H_DEFAULTS])
   AC_REQUIRE([gl_WCTYPE_H])
-  if test $HAVE_WCTYPE_T = 0; then
-    AC_LIBOBJ([wctype])
-  fi
+  HAVE_WCTYPE=$HAVE_WCTYPE_T
 ])
--- a/modules/wctype
+++ b/modules/wctype
@@ -14,10 +14,13 @@
 
 Depends-on:
 wctype-h
-iswblank        [test $HAVE_WCTYPE_T = 0]
+iswblank        [test $HAVE_WCTYPE = 0]
 
 configure.ac:
 gl_FUNC_WCTYPE
+if test $HAVE_WCTYPE = 0; then
+  AC_LIBOBJ([wctype])
+fi
 gl_WCTYPE_MODULE_INDICATOR([wctype])
 
 Makefile.am: