Add missing -liconv in various places.

Why were they missing and this only spotted now?
 - on Linux no separate iconv is needed
 - on OS X it is but it was probably being pulled in via *.la files
 - I've moved aside Fink's *.la files (since they reflect system
   libraries from their own build time not the current situation)

diff --git a/cgi/Makefile.am b/cgi/Makefile.am
index 22e2a77e1f62fed6b9f5c70d324b90eff2d14a15..1c4adbbc585312984f8c4c89ef2c19ab50653b27 100644 (file)
--- a/cgi/Makefile.am
+++ b/cgi/Makefile.am
@@ -23,7 +23,7 @@ AM_CPPFLAGS=-I${top_srcdir}/lib -I../lib
 disorder_SOURCES=macros-disorder.c lookup.c options.c actions.c        \
        login.c cgimain.c disorder-cgi.h
 disorder_LDADD=../lib/libdisorder.a \
-       $(LIBPCRE) $(LIBGCRYPT) $(LIBDL) $(LIBDB)
+       $(LIBPCRE) $(LIBGCRYPT) $(LIBDL) $(LIBDB) $(LIBICONV)
 disorder_LDFLAGS=-export-dynamic
 disorder_DEPENDENCIES=../lib/libdisorder.a
 

diff --git a/clients/Makefile.am b/clients/Makefile.am
index 86f0d489bc4373ac63375c42e31b0999eda7b49f..b0d0c0062db7e04134003d203d9f3dea3c983bdf 100644 (file)
--- a/clients/Makefile.am
+++ b/clients/Makefile.am
@@ -25,7 +25,7 @@ AM_CPPFLAGS=-I${top_srcdir}/lib -I../lib
 disorder_SOURCES=disorder.c authorize.c authorize.h \
        ../lib/memgc.c
 disorder_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
-       $(LIBGC) $(LIBGCRYPT) $(LIBPCRE) $(LIBDB) $(LIBPTHREAD)
+       $(LIBGC) $(LIBGCRYPT) $(LIBPCRE) $(LIBICONV) $(LIBDB) $(LIBPTHREAD)
 disorder_DEPENDENCIES=$(LIBOBJS) ../lib/libdisorder.a
 
 disorderfm_SOURCES=disorderfm.c \

diff --git a/disobedience/Makefile.am b/disobedience/Makefile.am
index e7072c745609282aaae1e1bf9f56671ef768a9d6..eaaa45d98ee6deaab35056028a1d6944d22d6b41 100644 (file)
--- a/disobedience/Makefile.am
+++ b/disobedience/Makefile.am
@@ -30,7 +30,7 @@ disobedience_SOURCES=disobedience.h disobedience.c client.c queue.c   \
        help.c ../lib/memgc.c settings.c users.c lookup.c choose.h      \
        popup.h
 disobedience_LDADD=../lib/libdisorder.a $(LIBPCRE) $(LIBGC) $(LIBGCRYPT) \
-       $(LIBASOUND) $(COREAUDIO) $(LIBDB)
+       $(LIBASOUND) $(COREAUDIO) $(LIBDB) $(LIBICONV)
 disobedience_LDFLAGS=$(GTK_LIBS)
 
 install-exec-hook:

diff --git a/server/Makefile.am b/server/Makefile.am
index 965467ed54fe2dca9c93ca85a6ac9408306a83b7..f67db97b37b52fc37964ec0316325abaf65c3605 100644 (file)
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -64,7 +64,7 @@ disorder_rescan_DEPENDENCIES=../lib/libdisorder.a
 disorder_choose_SOURCES=choose.c server-queue.c ../lib/memgc.c \
                        disorder-server.h
 disorder_choose_LDADD=$(LIBOBJS) ../lib/libdisorder.a   \
-       $(LIBDB) $(LIBGC) $(LIBPCRE) $(LIBGCRYPT)
+       $(LIBDB) $(LIBGC) $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT)
 disorder_choose_LDFLAGS=-export-dynamic
 disorder_choose_DEPENDENCIES=../lib/libdisorder.a