-liconv where needed

diff --git a/clients/Makefile.am b/clients/Makefile.am
index eb292d88d5e6e40cc2e441c075ced68ed3f85602..aaf0efb49833f3016907d8c6ec30b061e6b0310b 100644 (file)
--- a/clients/Makefile.am
+++ b/clients/Makefile.am
@@ -29,7 +29,7 @@ disorder_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
 disorder_DEPENDENCIES=$(LIBOBJS) ../lib/libdisorder.a
 
 disorderfm_SOURCES=disorderfm.c
-disorderfm_LDADD=$(LIBOBJS) ../lib/libdisorder.a $(LIBGC)
+disorderfm_LDADD=$(LIBOBJS) ../lib/libdisorder.a $(LIBGC) $(LIBICONV)
 disorderfm_DEPENDENCIES=$(LIBOBJS) ../lib/libdisorder.a
 
 filename_bytes_SOURCES=filename-bytes.c

diff --git a/disobedience/disobedience.c b/disobedience/disobedience.c
index 793525c57cb379a78fed49d1f409d5c66c80a5f0..7c6ef3dc9d6e0a7d1a03eb724785d8b359f22305 100644 (file)
--- a/disobedience/disobedience.c
+++ b/disobedience/disobedience.c
@@ -321,7 +321,6 @@ int main(int argc, char **argv) {
 
   mem_init(1);
   if(!setlocale(LC_CTYPE, "")) fatal(errno, "error calling setlocale");
-  /* Causes GTK+ to 0-fill lots of things, which helps the garbage collector. */
   gtk_init(&argc, &argv);
   gtk_rc_parse_string(style);
   while((n = getopt_long(argc, argv, "hVc:dtH", options, 0)) >= 0) {

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 98da26994323b3fb561a9d510618957d57fc6951..d9135cadb02822f9e318ee9c54e3937db59dcd1d 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -78,7 +78,7 @@ defs.o: definitions.h
 defs.lo: definitions.h
 
 test_SOURCES=test.c
-test_LDADD=libdisorder.a $(LIBPCRE) $(LIBGC)
+test_LDADD=libdisorder.a $(LIBPCRE) $(LIBGC) $(LIBICONV)
 test_DEPENDENCIES=libdisorder.a
 
 check: test

diff --git a/server/Makefile.am b/server/Makefile.am
index ab9cbd034cabc48b8535a4f649e4cba1514b31f5..9b9d094107a400468c3dbfd9a9ea13807274c8ce 100644 (file)
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -32,33 +32,33 @@ disorderd_SOURCES=disorderd.c                               \
        state.c state.h                                 \
        trackdb.c trackdb.h trackdb-int.h exports.c
 disorderd_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
-       $(LIBPCRE) $(LIBDB) $(LIBAO) $(LIBGC) $(LIBGCRYPT)
+       $(LIBPCRE) $(LIBDB) $(LIBAO) $(LIBGC) $(LIBGCRYPT) $(LIBICONV)
 disorderd_LDFLAGS=-export-dynamic
 disorderd_DEPENDENCIES=../lib/libdisorder.a
 
 disorder_deadlock_SOURCES=deadlock.c                    \
        trackdb.c trackdb.h
 disorder_deadlock_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
-       $(LIBDB) $(LIBPCRE) $(LIBGC)
+       $(LIBDB) $(LIBPCRE) $(LIBGC) $(LIBICONV)
 disorder_deadlock_DEPENDENCIES=../lib/libdisorder.a
 
 disorder_speaker_SOURCES=speaker.c
 disorder_speaker_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
-       $(LIBASOUND) $(LIBGC) $(LIBPCRE)
+       $(LIBASOUND) $(LIBGC) $(LIBPCRE) $(LIBICONV)
 disorder_speaker_DEPENDENCIES=../lib/libdisorder.a
 
 disorder_rescan_SOURCES=rescan.c                        \
        api.c api-server.c                              \
        trackdb.c trackdb.h exports.c
 disorder_rescan_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
-       $(LIBDB) $(LIBGC) $(LIBPCRE)
+       $(LIBDB) $(LIBGC) $(LIBPCRE) $(LIBICONV)
 disorder_rescan_LDFLAGS=-export-dynamic
 disorder_rescan_DEPENDENCIES=../lib/libdisorder.a
 
 disorder_dump_SOURCES=dump.c                           \
         trackdb.c trackdb.h
 disorder_dump_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
-       $(LIBPCRE) $(LIBDB) $(LIBGC)
+       $(LIBPCRE) $(LIBDB) $(LIBGC) $(LIBICONV)
 disorder_dump_DEPENDENCIES=$(LIBOBJS) ../lib/libdisorder.a
 
 disorder_cgi_SOURCES=dcgi.c dcgi.h                     \
@@ -70,7 +70,7 @@ disorder_cgi_LDFLAGS=-export-dynamic
 disorder_cgi_DEPENDENCIES=../lib/libdisorder.a
 
 trackname_SOURCES=trackname.c
-trackname_LDADD=../lib/libdisorder.a $(LIBGC) $(LIBPCRE)
+trackname_LDADD=../lib/libdisorder.a $(LIBGC) $(LIBPCRE) $(LIBICONV)
 trackname_DEPENDENCIES=../lib/libdisorder.a
 
 install-exec-hook: