Mercurial > hg > octave-lojdl > gnulib-hg
changeset 14981:f557c357cfc4
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.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Sun, 08 May 2011 21:24:22 +0200 |
| parents | 8894cea69a3b |
| children | 734141d3f8bf |
| files | ChangeLog m4/iconv_open.m4 modules/iconv_open |
| diffstat | 3 files changed, 15 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +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.
--- 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 @@ [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 @@ [ gl_REPLACE_ICONV_H REPLACE_ICONV_OPEN=1 - AC_LIBOBJ([iconv_open]) ])
--- a/modules/iconv_open +++ b/modules/iconv_open @@ -24,6 +24,13 @@ 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