From a4766caa48b06b06edbe100f8bc17db721bb0efa Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Sat, 3 Oct 2009 14:27:42 +0100 Subject: [PATCH] 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) Organization: Straylight/Edgeware From: Richard Kettlewell --- cgi/Makefile.am | 2 +- clients/Makefile.am | 2 +- disobedience/Makefile.am | 2 +- server/Makefile.am | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cgi/Makefile.am b/cgi/Makefile.am index 22e2a77..1c4adbb 100644 --- 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 86f0d48..b0d0c00 100644 --- 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 e7072c7..eaaa45d 100644 --- 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 965467e..f67db97 100644 --- 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 -- [mdw]