From 39e1adf83f9afbbc1ab9edbd6ca3d509c1f1bec4 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sat, 21 May 2011 14:21:12 +0200
Subject: [PATCH] mbsinit: Move AC_LIBOBJ invocations to module description.

* m4/mbsinit.m4 (gl_FUNC_MBSINIT): Move AC_LIBOBJ and gl_PREREQ_MBSINIT
invocations from here...
* modules/mbsinit (configure.ac): ... to here.
---
 ChangeLog       | 7 +++++++
 m4/mbsinit.m4   | 6 +-----
 modules/mbsinit | 4 ++++
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 60ce43d19b..60f0b8c0b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-21  Bruno Haible  <bruno@clisp.org>
+
+	mbsinit: Move AC_LIBOBJ invocations to module description.
+	* m4/mbsinit.m4 (gl_FUNC_MBSINIT): Move AC_LIBOBJ and gl_PREREQ_MBSINIT
+	invocations from here...
+	* modules/mbsinit (configure.ac): ... to here.
+
 2011-05-21  Bruno Haible  <bruno@clisp.org>
 
 	mbrlen: Move AC_LIBOBJ invocations to module description.
diff --git a/m4/mbsinit.m4 b/m4/mbsinit.m4
index b42a49ab49..d364b7e0fe 100644
--- a/m4/mbsinit.m4
+++ b/m4/mbsinit.m4
@@ -1,4 +1,4 @@
-# mbsinit.m4 serial 6
+# mbsinit.m4 serial 7
 dnl Copyright (C) 2008, 2010-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,
@@ -27,10 +27,6 @@ AC_DEFUN([gl_FUNC_MBSINIT],
       esac
     fi
   fi
-  if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then
-    AC_LIBOBJ([mbsinit])
-    gl_PREREQ_MBSINIT
-  fi
 ])
 
 # Prerequisites of lib/mbsinit.c.
diff --git a/modules/mbsinit b/modules/mbsinit
index a8ee058a0e..3a0cebf548 100644
--- a/modules/mbsinit
+++ b/modules/mbsinit
@@ -14,6 +14,10 @@ verify          [test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1]
 
 configure.ac:
 gl_FUNC_MBSINIT
+if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then
+  AC_LIBOBJ([mbsinit])
+  gl_PREREQ_MBSINIT
+fi
 gl_WCHAR_MODULE_INDICATOR([mbsinit])
 
 Makefile.am:
-- 
2.30.2