From 3a8b42d3b8549afa2da08757107f43c41d19ae0c Mon Sep 17 00:00:00 2001
From: Richard Kettlewell <rjk@greenend.org.uk>
Date: Sun, 15 Jul 2007 22:38:58 +0100
Subject: [PATCH] -liconv where needed

---
 clients/Makefile.am         |  2 +-
 disobedience/disobedience.c |  1 -
 lib/Makefile.am             |  2 +-
 server/Makefile.am          | 12 ++++++------
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/clients/Makefile.am b/clients/Makefile.am
index eb292d8..aaf0efb 100644
--- 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 793525c..7c6ef3d 100644
--- 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 98da269..d9135ca 100644
--- 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 ab9cbd0..9b9d094 100644
--- 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:
-- 
2.11.0