From 3e18c190dbdd29e81ba5fcf3628fc9326aad6b54 Mon Sep 17 00:00:00 2001 From: Ian Beckwith Date: Mon, 19 Apr 2010 16:42:47 +0100 Subject: [PATCH] libunistring: Detect libunistring also when it depends on libiconv. (cherry picked from commit 1820b302be900a38b063404af66a00ae88552ce7) --- ChangeLog | 6 ++++++ m4/libunistring.m4 | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 797a2aa82..8091ba8ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2010-04-11 Bruno Haible + 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 Bruno Haible + * m4/libunistring.m4 (gl_LIBUNISTRING): Fix typo in comment. 2010-04-10 Bruno Haible diff --git a/m4/libunistring.m4 b/m4/libunistring.m4 index 4f1146f38..19350d028 100644 --- 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 @@ AC_DEFUN([gl_LIBUNISTRING], 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], [], -- 2.11.0