libunistring: Correct value of $LTLIBUNISTRING.

(cherry picked from commit e330e06a9fbd13eb257c3b8ac2b2951e6bddac8b)

diff --git a/ChangeLog b/ChangeLog
index d337a0b..7e4eed0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2010-04-11  Bruno Haible  <bruno@clisp.org>
 
+       libunistring: Correct value of $LTLIBUNISTRING.
+       * m4/libunistring.m4 (gl_LIBUNISTRING): When it depends on libiconv,
+       correct the value of $LTLIBUNISTRING.
+
+2010-04-11  Bruno Haible  <bruno@clisp.org>
+
        havelib: Add static libraries to LIBS in the right order.
        * m4/lib-link.m4 (AC_LIB_HAVE_LINKFLAGS): When $LIB[]NAME contains no
        -l options, prepend it to $LIBS, instead of appending it to $LIBS.

diff --git a/m4/libunistring.m4 b/m4/libunistring.m4
index 19350d0..ac9d11a 100644 (file)
--- a/m4/libunistring.m4
+++ b/m4/libunistring.m4
@@ -1,4 +1,4 @@
-# libunistring.m4 serial 3
+# libunistring.m4 serial 4
 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,
@@ -33,6 +33,7 @@ AC_DEFUN([gl_LIBUNISTRING],
         [no, consider installing GNU libunistring])
       if test -n "$LIBUNISTRING"; then
         LIBUNISTRING="$LIBUNISTRING $LIBICONV"
+        LTLIBUNISTRING="$LTLIBUNISTRING $LTLIBICONV"
       fi
       LIBS="$glus_save_LIBS"
     fi