Paolo Bonzini wrote:
> * m4/libunistring.m4: Do not repeat twice "no, consider installing GNU
> libunistring". Also add a missing-message parameter like the one
> of AM_LIB_HAVE_LINKFLAGS.
I'm applying the first part of your patch, like below. With it, the output
is changed from
checking for libunistring... no, consider installing GNU libunistring
checking for libunistring... yes
checking how to link with libunistring...
/arch/x86-linux/gnu-inst-libunistring/0.9.2.1+libiconv-static/lib/libunistring.a
to
checking for libunistring... no, trying again together with libiconv
checking for libunistring... yes
checking how to link with libunistring...
/arch/x86-linux/gnu-inst-libunistring/0.9.2.1+libiconv-static/lib/libunistring.a
This is still not right, because the last line should also mention libiconv.a.
But that's not dramatic. The important thing is that the value stored in
config.status contains libiconv.a.
2010-04-11 Paolo Bonzini <bonz...@gnu.org>
Bruno Haible <br...@clisp.org>
libunistring: Improve configure output.
* m4/libunistring.m4 (gl_LIBUNISTRING): Check for libiconv first.
Don't say "consider installing GNU libunistring" when checking again
with libiconv.
--- m4/libunistring.m4.orig Sun Apr 11 18:23:54 2010
+++ m4/libunistring.m4 Sun Apr 11 18:23:35 2010
@@ -1,4 +1,4 @@
-# libunistring.m4 serial 4
+# libunistring.m4 serial 5
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,
@@ -13,16 +13,16 @@
AC_DEFUN([gl_LIBUNISTRING],
[
- dnl First, try to link without -liconv. libunistring often depends on
- dnl libiconv, but we don't know (and often don't need to know) where
- dnl libiconv is installed.
- AC_LIB_HAVE_LINKFLAGS([unistring], [],
- [#include <uniconv.h>], [u8_strconv_from_locale((char*)0);],
- [no, consider installing GNU libunistring])
- if test "$ac_cv_libunistring" != yes; then
- dnl Second try, with -liconv.
- AC_REQUIRE([AM_ICONV])
- if test -n "$LIBICONV"; then
+ AC_REQUIRE([AM_ICONV])
+ if test -n "$LIBICONV"; then
+ dnl First, try to link without -liconv. libunistring often depends on
+ dnl libiconv, but we don't know (and often don't need to know) where
+ dnl libiconv is installed.
+ AC_LIB_HAVE_LINKFLAGS([unistring], [],
+ [#include <uniconv.h>], [u8_strconv_from_locale((char*)0);],
+ [no, trying again together with libiconv])
+ if test "$ac_cv_libunistring" != yes; then
+ dnl Second try, with -liconv.
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
@@ -37,5 +37,9 @@
fi
LIBS="$glus_save_LIBS"
fi
+ else
+ AC_LIB_HAVE_LINKFLAGS([unistring], [],
+ [#include <uniconv.h>], [u8_strconv_from_locale((char*)0);],
+ [no, consider installing GNU libunistring])
fi
])
