From fe2225f64c4f0f5061c1569fc9da22a1a9a87abc Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sun, 22 May 2011 19:00:44 +0200
Subject: [PATCH] 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.
---
 ChangeLog        | 7 +++++++
 m4/wcswidth.m4   | 5 +----
 modules/wcswidth | 3 +++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3d6c7b066..5a7100c08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 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.
 	* m4/wcwidth.m4 (gl_FUNC_WCWIDTH): Set HAVE_WCWIDTH. Move AC_LIBOBJ
 	invocation from here...
diff --git a/m4/wcswidth.m4 b/m4/wcswidth.m4
index 80ccf3f86..40f71b2c7 100644
--- 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 629f21db8..27eabf3a3 100644
--- 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:
-- 
2.11.0