Mercurial > hg > octave-nkf > gnulib-hg
changeset 13213:bb84826a3de8
libunistring: Detect libunistring also when it depends on libiconv.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Sun, 11 Apr 2010 18:01:52 +0200 |
parents | d724e1ff61cd |
children | 35f69122ceca |
files | ChangeLog m4/libunistring.m4 |
diffstat | 2 files changed, 10 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-04-11 Bruno Haible <bruno@clisp.org> + + libunistring: Detect libunistring also when it depends on libiconv. + * m4/libunistring.m4 (gl_LIBUNISTRING): Unset the cached result before + the second AC_LIB_HAVE_LINKFLAGS invocation. + 2010-04-11 James Youngman <jay@gnu.org> close-stream: declare local scalars to be "const"
--- a/m4/libunistring.m4 +++ b/m4/libunistring.m4 @@ -1,4 +1,4 @@ -# libunistring.m4 serial 2 +# libunistring.m4 serial 3 dnl Copyright (C) 2009-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -23,6 +23,9 @@ dnl Second try, with -liconv. AC_REQUIRE([AM_ICONV]) if test -n "$LIBICONV"; then + dnl We have to erase the cached result of the first AC_LIB_HAVE_LINKFLAGS + dnl invocation, otherwise the second one will not be run. + unset ac_cv_libunistring glus_save_LIBS="$LIBS" LIBS="$LIBS $LIBICONV" AC_LIB_HAVE_LINKFLAGS([unistring], [],