diff -ur btg-0.7.old/UI/cli/Makefile.am btg-0.7/UI/cli/Makefile.am
--- btg-0.7.old/UI/cli/Makefile.am	2006-11-26 14:37:37.000000000 +0100
+++ btg-0.7/UI/cli/Makefile.am	2006-11-26 14:38:08.000000000 +0100
@@ -11,9 +11,8 @@
                  $(top_builddir)/bcore/auth/libbhash.la \
                  $(top_builddir)/bcore/command/libcommand.la \
                  $(top_builddir)/bcore/auth/libbhash.la \
-                 $(top_builddir)/external/ini/libini.la
-
-btgcli_LDFLAGS = @LIBS@ @CURSES_LIB@ -l@BOOST_DATE_TIME_LIB@ -l@BOOST_IOSTREAMS_LIB@ -l@BOOST_FILESYSTEM_LIB@ @LIBGNUTLS_LIBS@ @LIBGNUTLS_EXTRA_LIBS@ -l@BOOST_PROGRAM_OPTIONS_LIB@
+                 $(top_builddir)/external/ini/libini.la \
+                 @LIBS@ @CURSES_LIB@ -l@BOOST_DATE_TIME_LIB@ -l@BOOST_IOSTREAMS_LIB@ -l@BOOST_FILESYSTEM_LIB@ @LIBGNUTLS_LIBS@ @LIBGNUTLS_EXTRA_LIBS@ -l@BOOST_PROGRAM_OPTIONS_LIB@
 btgcli_CFLAGS   = @CFLAGS@ @LIBGNUTLS_CFLAGS@ @LIBGNUTLS_EXTRA_CFLAGS@ \
                   -DBTG_DEBUG=@BTG_DEBUG@
 btgcli_CXXFLAGS = @CXXFLAGS@ @LIBGNUTLS_CFLAGS@ @LIBGNUTLS_EXTRA_CFLAGS@ \
diff -ur btg-0.7.old/UI/gui/Makefile.am btg-0.7/UI/gui/Makefile.am
--- btg-0.7.old/UI/gui/Makefile.am	2006-11-26 14:37:37.000000000 +0100
+++ btg-0.7/UI/gui/Makefile.am	2006-11-26 14:39:47.000000000 +0100
@@ -21,9 +21,8 @@
                 $(top_builddir)/bcore/os/libos.la \
                 $(top_builddir)/bcore/command/libcommand.la \
                 $(top_builddir)/bcore/auth/libbhash.la \
-                $(top_builddir)/external/ini/libini.la
-
-btgui_LDFLAGS  = @LIBS@ @PCM_GTKMM_LIBS@ -l@BOOST_DATE_TIME_LIB@ -l@BOOST_IOSTREAMS_LIB@ -l@BOOST_FILESYSTEM_LIB@ @LIBGNUTLS_LIBS@ @LIBGNUTLS_EXTRA_LIBS@ -l@BOOST_PROGRAM_OPTIONS_LIB@
+                $(top_builddir)/external/ini/libini.la \
+                @LIBS@ @PCM_GTKMM_LIBS@ -l@BOOST_DATE_TIME_LIB@ -l@BOOST_IOSTREAMS_LIB@ -l@BOOST_FILESYSTEM_LIB@ @LIBGNUTLS_LIBS@ @LIBGNUTLS_EXTRA_LIBS@ -l@BOOST_PROGRAM_OPTIONS_LIB@
 btgui_CXXFLAGS = @CXXFLAGS@ @PCM_GTKMM_CFLAGS@ @LIBGNUTLS_CFLAGS@ @LIBGNUTLS_EXTRA_CFLAGS@ \
                  -DBTG_DEBUG=@BTG_DEBUG@ 
 
diff -ur btg-0.7.old/bcore/client/Makefile.am btg-0.7/bcore/client/Makefile.am
--- btg-0.7.old/bcore/client/Makefile.am	2006-11-26 14:37:37.000000000 +0100
+++ btg-0.7/bcore/client/Makefile.am	2006-11-26 14:40:57.000000000 +0100
@@ -18,6 +18,6 @@
 
 libclient_la_CFLAGS   = @DEBUG_CFLAGS@ -DBTG_DEBUG=@BTG_DEBUG@
 libclient_la_CXXFLAGS = @DEBUG_CXXFLAGS@ -DBTG_DEBUG=@BTG_DEBUG@
-libclient_la_LDFLAGS  = -l@BOOST_PROGRAM_OPTIONS_LIB@
+libclient_la_LIBADD  = -l@BOOST_PROGRAM_OPTIONS_LIB@
 
 INCLUDES             = -I$(top_srcdir)
diff -ur btg-0.7.old/daemon/Makefile.am btg-0.7/daemon/Makefile.am
--- btg-0.7.old/daemon/Makefile.am	2006-11-26 14:37:37.000000000 +0100
+++ btg-0.7/daemon/Makefile.am	2006-11-26 14:38:08.000000000 +0100
@@ -56,9 +56,8 @@
                     $(top_builddir)/bcore/command/libcommand.la \
                     $(top_builddir)/bcore/logger/liblogger.la \
                     $(top_builddir)/external/ini/libini.la \
-                    $(top_builddir)/bcore/auth/libbhash.la
-
-btgdaemon_LDFLAGS  = @LIBS@ @LIBTORRENT_LIBS@ -l@BOOST_IOSTREAMS_LIB@ @LIBGNUTLS_LIBS@ @LIBGNUTLS_EXTRA_LIBS@ \
+                    $(top_builddir)/bcore/auth/libbhash.la \
+                    @LIBS@ @LIBTORRENT_LIBS@ -l@BOOST_IOSTREAMS_LIB@ @LIBGNUTLS_LIBS@ @LIBGNUTLS_EXTRA_LIBS@ \
 -l@BOOST_PROGRAM_OPTIONS_LIB@
 
 btgdaemon_CFLAGS   = @CFLAGS@   @DEBUG_CFLAGS@ @LIBGNUTLS_CFLAGS@ @LIBGNUTLS_EXTRA_CFLAGS@ \
diff -ur btg-0.7.old/daemon/auth/Makefile.am btg-0.7/daemon/auth/Makefile.am
--- btg-0.7.old/daemon/auth/Makefile.am	2006-11-26 14:37:37.000000000 +0100
+++ btg-0.7/daemon/auth/Makefile.am	2006-11-26 14:38:08.000000000 +0100
@@ -22,10 +22,8 @@
                     $(top_builddir)/bcore/logger/liblogger.la \
                     $(top_builddir)/bcore/os/libos.la \
                     $(top_builddir)/external/ini/libini.la \
-                    $(top_builddir)/bcore/auth/libbhash.la 
-
-
-btgpasswd_LDFLAGS  = @LIBS@ @LIBTORRENT_LIBS@ -l@BOOST_IOSTREAMS_LIB@ @LIBGNUTLS_LIBS@ @LIBGNUTLS_EXTRA_LIBS@ @LIBGNUTLS_LIBS@ @LIBGNUTLS_EXTRA_LIBS@ -l@BOOST_PROGRAM_OPTIONS_LIB@
+                    $(top_builddir)/bcore/auth/libbhash.la \
+                    @LIBS@ @LIBTORRENT_LIBS@ -l@BOOST_IOSTREAMS_LIB@ @LIBGNUTLS_LIBS@ @LIBGNUTLS_EXTRA_LIBS@ @LIBGNUTLS_LIBS@ @LIBGNUTLS_EXTRA_LIBS@ -l@BOOST_PROGRAM_OPTIONS_LIB@
 
 btgpasswd_CFLAGS   = @CFLAGS@   @DEBUG_CFLAGS@ @LIBGNUTLS_CFLAGS@ @LIBGNUTLS_EXTRA_CFLAGS@ \
 -DBTG_DEBUG=@BTG_DEBUG@ -DBTG_OPTION_SAVESESSIONS=@BTG_OPTION_SAVESESSIONS@ \
diff -ur btg-0.7.old/doc/commands/Makefile.am btg-0.7/doc/commands/Makefile.am
--- btg-0.7.old/doc/commands/Makefile.am	2006-11-26 14:37:37.000000000 +0100
+++ btg-0.7/doc/commands/Makefile.am	2006-11-26 14:38:54.000000000 +0100
@@ -10,9 +10,8 @@
                        $(top_builddir)/bcore/externalization/libextern.la \
                        $(top_builddir)/bcore/auth/libbhash.la \
                        $(top_builddir)/bcore/command/libcommand.la \
-                       $(top_builddir)/bcore/auth/libbhash.la
-
-gen_cmd_docs_LDFLAGS = @LIBS@ @LIBTORRENT_LIBS@ -l@BOOST_IOSTREAMS_LIB@ @LIBGNUTLS_LIBS@ @LIBGNUTLS_EXTRA_LIBS@
+                       $(top_builddir)/bcore/auth/libbhash.la \
+                       @LIBS@ @LIBTORRENT_LIBS@ -l@BOOST_IOSTREAMS_LIB@ @LIBGNUTLS_LIBS@ @LIBGNUTLS_EXTRA_LIBS@
 
 gen_cmd_docs_CFLAGS   = @CFLAGS@   -DBTG_DEBUG=@BTG_DEBUG@
 gen_cmd_docs_CXXFLAGS = @CXXFLAGS@ -DBTG_DEBUG=@BTG_DEBUG@
diff -ur btg-0.7.old/external/xmlrpc-epi/src/Makefile.am btg-0.7/external/xmlrpc-epi/src/Makefile.am
--- btg-0.7.old/external/xmlrpc-epi/src/Makefile.am	2006-11-26 14:37:37.000000000 +0100
+++ btg-0.7/external/xmlrpc-epi/src/Makefile.am	2006-11-26 14:40:39.000000000 +0100
@@ -3,7 +3,7 @@
 
 noinst_LTLIBRARIES = libxmlrpc.la
 
-libxmlrpc_la_LIBADD = $(top_builddir)/external/xmlrpc-epi/expat/xmltok/libexpat_tok.la $(top_builddir)/external/xmlrpc-epi/expat/xmlparse/libexpat_parse.la
+libxmlrpc_la_LIBADD = $(top_builddir)/external/xmlrpc-epi/expat/xmltok/libexpat_tok.la $(top_builddir)/external/xmlrpc-epi/expat/xmlparse/libexpat_parse.la @LIBICONV@
 
 libxmlrpc_la_SOURCES = \
 	base64.c \
@@ -18,7 +18,7 @@
 	xmlrpc_introspection.c \
         system_methods.c
         
-libxmlrpc_la_LDFLAGS = @LIBICONV@ -version-info 0:3:0 
+libxmlrpc_la_LDFLAGS = -version-info 0:3:0 
 
 noinst_HEADERS = \
 	base64.h \
diff -ur btg-0.7.old/utest/Makefile.am btg-0.7/utest/Makefile.am
--- btg-0.7.old/utest/Makefile.am	2006-11-26 14:37:37.000000000 +0100
+++ btg-0.7/utest/Makefile.am	2006-11-26 14:41:47.000000000 +0100
@@ -61,10 +61,9 @@
                      $(top_builddir)/bcore/logger/liblogger.la \
                      $(top_builddir)/bcore/command/libcommand.la \
                      $(top_builddir)/daemon/libdaemon.la \
-							$(top_builddir)/external/ini/libini.la \
-                     $(top_builddir)/bcore/auth/libbhash.la $(BCORE_CLIENT_TEST_LIB)
-
-testrunner_LDFLAGS  = @LIBS@ $(CPPUNIT_LIBS) @LIBTORRENT_LIBS@ -l@BOOST_IOSTREAMS_LIB@ -l@BOOST_FILESYSTEM_LIB@ @LIBGNUTLS_LIBS@ @LIBGNUTLS_EXTRA_LIBS@
+                     $(top_builddir)/external/ini/libini.la \
+                     $(top_builddir)/bcore/auth/libbhash.la $(BCORE_CLIENT_TEST_LIB) \
+                     @LIBS@ $(CPPUNIT_LIBS) @LIBTORRENT_LIBS@ -l@BOOST_IOSTREAMS_LIB@ -l@BOOST_FILESYSTEM_LIB@ @LIBGNUTLS_LIBS@ @LIBGNUTLS_EXTRA_LIBS@
 
 testrunner_CFLAGS   = @CFLAGS@   $(CPPUNIT_CFLAGS) @LIBTORRENT_CFLAGS@ @LIBGNUTLS_CFLAGS@ @LIBGNUTLS_EXTRA_CFLAGS@ \
                       -DBTG_DEBUG=@BTG_DEBUG@ \