From d6e7d5f9c6eb573655d1eba280e3a7dbf02370c2 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 8 May 2011 21:24:22 +0200 Subject: [PATCH] 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. --- ChangeLog | 7 +++++++ m4/iconv_open.m4 | 5 +---- modules/iconv_open | 7 +++++++ 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8960c21067..97a81674b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2011-05-08 Bruno Haible + + 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 iconv_open, iconv_open-utf: Respect rules for use of AC_LIBOBJ. diff --git a/m4/iconv_open.m4 b/m4/iconv_open.m4 index 7960a88d94..accdecc22f 100644 --- 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 5079d27577..c965b8ff7a 100644 --- 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 -- 2.30.2