_LIBADD is reserved for object files, not -L and -l options.

diff --git a/ChangeLog b/ChangeLog
index f679409..1298790 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2006-09-05  Bruno Haible  <bruno@clisp.org>
 
+       * modules/gc (Makefile.am): Augment lib_LDFLAGS, not lib_LIBADD.
+       * modules/iconvme (Makefile.am): Likewise. Also handle the case of
+       not using libtool correctly.
+
+2006-09-05  Bruno Haible  <bruno@clisp.org>
+
        * gnulib-tool (func_emit_lib_Makefile_am): Initialize also
        lib_..._LDFLAGS.
 

diff --git a/modules/gc b/modules/gc
index fee4e77..78ace10 100644 (file)
--- a/modules/gc
+++ b/modules/gc
@@ -16,9 +16,9 @@ gl_GC
 Makefile.am:
 EXTRA_DIST += gc.h
 if GL_COND_LIBTOOL
-lib_LIBADD += $(LTLIBGCRYPT)
+lib_LDFLAGS += $(LTLIBGCRYPT)
 else
-lib_LIBADD += $(LIBGCRYPT)
+lib_LDFLAGS += $(LIBGCRYPT)
 endif
 
 Include:

diff --git a/modules/iconvme b/modules/iconvme
index 43a8984..34636dd 100644 (file)
--- a/modules/iconvme
+++ b/modules/iconvme
@@ -15,7 +15,11 @@ gl_ICONVME
 
 Makefile.am:
 lib_SOURCES += iconvme.h iconvme.c
-lib_LIBADD += $(LTLIBICONV)
+if GL_COND_LIBTOOL
+lib_LDFLAGS += $(LTLIBICONV)
+else
+lib_LDFLAGS += $(LIBICONV)
+endif
 
 Include:
 "iconvme.h"