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.

diff --git a/ChangeLog b/ChangeLog
index 3d6c7b06660799c426addfdb523452590336b4d7..5a7100c08d375ed85029ab7cc67dc4c2dc99dac7 100644 (file)
--- 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.

diff --git a/m4/wcswidth.m4 b/m4/wcswidth.m4
index 80ccf3f86631865ace1289bdaad99e6052779cd9..40f71b2c7ff2eb5aab77821bcecb123977c5728a 100644 (file)
--- 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 @@ AC_DEFUN([gl_FUNC_WCSWIDTH],
       REPLACE_WCSWIDTH=1
     fi
   fi
-  if test $HAVE_WCSWIDTH = 0 || test $REPLACE_WCSWIDTH = 1; then
-    AC_LIBOBJ([wcswidth])
-  fi
 ])

diff --git a/modules/wcswidth b/modules/wcswidth
index 629f21db804285647ba7719ae7a8aa3a2d422563..27eabf3a32f1a9769db7b5132bee63e6dcd06cb3 100644 (file)
--- a/modules/wcswidth
+++ b/modules/wcswidth
@@ -13,6 +13,9 @@ wcwidth         [test $HAVE_WCSWIDTH = 0 || test $REPLACE_WCSWIDTH = 1]
 
 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: