gettimeofday: port recent C++ fix to Emacs

[gnulib.git] / modules / striconv

diff --git a/modules/striconv b/modules/striconv
index 887681e..a411248 100644 (file)
--- a/modules/striconv
+++ b/modules/striconv
@@ -7,24 +7,30 @@ lib/striconv.c
 
 Depends-on:
 iconv
+iconv_open
 strdup
 c-strcase
 
 configure.ac:
+if test $gl_cond_libtool = false; then
+  gl_ltlibdeps="$gl_ltlibdeps $LTLIBICONV"
+  gl_libdeps="$gl_libdeps $LIBICONV"
+fi
 
 Makefile.am:
 lib_SOURCES += striconv.h striconv.c
 if GL_COND_LIBTOOL
 lib_LDFLAGS += $(LTLIBICONV)
-else
-lib_LDFLAGS += $(LIBICONV)
 endif
 
 Include:
 "striconv.h"
 
+Link:
+$(LTLIBICONV) when linking with libtool, $(LIBICONV) otherwise
+
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible, Simon Josefsson