wcwidth: Respect rules for use of AC_LIBOBJ.

* m4/wcwidth.m4 (gl_FUNC_WCWIDTH): Set HAVE_WCWIDTH. Move AC_LIBOBJ
invocation from here...
* modules/wcwidth (configure.ac): ... to here.
(Depends-on): Update conditions.

diff --git a/ChangeLog b/ChangeLog
index 7d7be3a05a71deb2ef8de738842af69764312228..3d6c7b06660799c426addfdb523452590336b4d7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-22  Bruno Haible  <bruno@clisp.org>
+
+       wcwidth: Respect rules for use of AC_LIBOBJ.
+       * m4/wcwidth.m4 (gl_FUNC_WCWIDTH): Set HAVE_WCWIDTH. Move AC_LIBOBJ
+       invocation from here...
+       * modules/wcwidth (configure.ac): ... to here.
+       (Depends-on): Update conditions.
+
 2011-05-22  Bruno Haible  <bruno@clisp.org>
 
        wctype: Move AC_LIBOBJ invocations to module description.

diff --git a/m4/wcwidth.m4 b/m4/wcwidth.m4
index dbcc231be4c0ab1f1a8088205c7ee85fb0c3a9fa..8a97e3891679ae4e247a0c0cc7303edf1202f490 100644 (file)
--- a/m4/wcwidth.m4
+++ b/m4/wcwidth.m4
@@ -1,4 +1,4 @@
-# wcwidth.m4 serial 19
+# wcwidth.m4 serial 20
 dnl Copyright (C) 2006-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,
@@ -35,6 +35,7 @@ AC_DEFUN([gl_FUNC_WCWIDTH],
   fi
 
   if test $ac_cv_func_wcwidth = yes; then
+    HAVE_WCWIDTH=1
     dnl On MacOS X 10.3, wcwidth(0x0301) (COMBINING ACUTE ACCENT) returns 1.
     dnl On OSF/1 5.1, wcwidth(0x200B) (ZERO WIDTH SPACE) returns 1.
     dnl This leads to bugs in 'ls' (coreutils).
@@ -89,9 +90,8 @@ changequote([,])dnl
       *yes) ;;
       *no) REPLACE_WCWIDTH=1 ;;
     esac
-  fi
-  if test $ac_cv_func_wcwidth != yes || test $REPLACE_WCWIDTH = 1; then
-    AC_LIBOBJ([wcwidth])
+  else
+    HAVE_WCWIDTH=0
   fi
   dnl We don't substitute HAVE_WCWIDTH. We assume that if the system does not
   dnl have the wcwidth function, then it does not declare it.

diff --git a/modules/wcwidth b/modules/wcwidth
index 27327a15c9e7650dd2564e221618b60093fbbd42..7b6913b1b02d3b2df8d1f476efdbe6718b9855ad 100644 (file)
--- a/modules/wcwidth
+++ b/modules/wcwidth
@@ -10,13 +10,16 @@ m4/wint_t.m4
 Depends-on:
 wchar
 extensions
-wctype-h        [test $ac_cv_func_wcwidth != yes || test $REPLACE_WCWIDTH = 1]
-localcharset    [test $ac_cv_func_wcwidth != yes || test $REPLACE_WCWIDTH = 1]
-streq           [test $ac_cv_func_wcwidth != yes || test $REPLACE_WCWIDTH = 1]
-uniwidth/width  [test $ac_cv_func_wcwidth != yes || test $REPLACE_WCWIDTH = 1]
+wctype-h        [test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1]
+localcharset    [test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1]
+streq           [test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1]
+uniwidth/width  [test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1]
 
 configure.ac:
 gl_FUNC_WCWIDTH
+if test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1; then
+  AC_LIBOBJ([wcwidth])
+fi
 gl_WCHAR_MODULE_INDICATOR([wcwidth])
 
 Makefile.am: