iconv_open: Move AC_LIBOBJ invocations to module description.

* m4/iconv_open.m4 (gl_FUNC_ICONV_OPEN, gl_REPLACE_ICONV_OPEN): Move
AC_LIBOBJ invocations from here...
* modules/iconv_open (configure.ac): ... to here.

diff --git a/ChangeLog b/ChangeLog
index 8960c21..97a8167 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2011-05-08  Bruno Haible  <bruno@clisp.org>
 
+       iconv_open: Move AC_LIBOBJ invocations to module description.
+       * m4/iconv_open.m4 (gl_FUNC_ICONV_OPEN, gl_REPLACE_ICONV_OPEN): Move
+       AC_LIBOBJ invocations from here...
+       * modules/iconv_open (configure.ac): ... to here.
+
+2011-05-08  Bruno Haible  <bruno@clisp.org>
+
        iconv_open, iconv_open-utf: Respect rules for use of AC_LIBOBJ.
        If module 'iconv_open' is among the main modules and module
        'iconv_open-utf' is among the tests dependencies, then

diff --git a/m4/iconv_open.m4 b/m4/iconv_open.m4
index 7960a88..accdecc 100644 (file)
--- a/m4/iconv_open.m4
+++ b/m4/iconv_open.m4
@@ -1,4 +1,4 @@
-# iconv_open.m4 serial 13
+# iconv_open.m4 serial 14
 dnl Copyright (C) 2007-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,
@@ -44,8 +44,6 @@ AC_DEFUN([gl_FUNC_ICONV_OPEN],
           [Define if the iconv() functions are enhanced to handle the UTF-{16,32}{BE,LE} encodings.])
         REPLACE_ICONV=1
         gl_REPLACE_ICONV_OPEN
-        AC_LIBOBJ([iconv])
-        AC_LIBOBJ([iconv_close])
       fi
     ])
   fi
@@ -55,5 +53,4 @@ AC_DEFUN([gl_REPLACE_ICONV_OPEN],
 [
   gl_REPLACE_ICONV_H
   REPLACE_ICONV_OPEN=1
-  AC_LIBOBJ([iconv_open])
 ])

diff --git a/modules/iconv_open b/modules/iconv_open
index 5079d27..c965b8f 100644 (file)
--- a/modules/iconv_open
+++ b/modules/iconv_open
@@ -24,6 +24,13 @@ unistr/u8-uctomb  [test $REPLACE_ICONV_UTF = 1]
 
 configure.ac:
 gl_FUNC_ICONV_OPEN
+if test $REPLACE_ICONV_OPEN = 1; then
+  AC_LIBOBJ([iconv_open])
+fi
+if test $REPLACE_ICONV = 1; then
+  AC_LIBOBJ([iconv])
+  AC_LIBOBJ([iconv_close])
+fi
 
 Makefile.am:
 iconv_open-aix.h: iconv_open-aix.gperf