--- courier-0.49.0/maildrop/Makefile.am.orig	2004-10-31 04:13:48.000000000 +0100
+++ courier-0.49.0/maildrop/Makefile.am	2005-03-24 23:14:03.438223172 +0100
@@ -67,9 +67,8 @@
 mailbot_SOURCES=mailbot.c
 mailbot_DEPENDENCIES=../rfc822/librfc822.la ../liblock/liblock.la \
 	../numlib/libnumlib.la $(DBLIB)
-mailbot_LDADD=../rfc822/librfc822.la ../liblock/liblock.la \
-	../numlib/libnumlib.la $(DBLIB) $(LIBGDBM)
-mailbot_LDFLAGS = -static
+mailbot_LDADD=../rfc822/.libs/librfc822.a ../liblock/.libs/liblock.a \
+	../numlib/.libs/libnumlib.a $(DBLIB) $(LIBGDBM)
 
 EXTRA_DIST = maildroptips.html $(BUILT_SOURCES)\
 	maildrop.lsm testsuite.txt
--- courier-0.58.0.orig/tcpd/configure.in	2008-01-20 00:58:25.950145421 +0100
+++ courier-0.58.0/tcpd/configure.in	2008-01-20 01:00:02.381596233 +0100
@@ -83,14 +83,14 @@
 	USE_DB=0
 	LIBDB=""
 	dblibrary=../gdbmobj/libgdbmobj.la
-	LIBGDBM="-Wl,$LIBGDBM"
+	LIBGDBM="$LIBGDBM"
 	;;
 db)
 	USE_DB=1
 	USE_GDBM=0
 	LIBGDBM=""
 	dblibrary=../bdbobj/libbdbobj.la
-	LIBDB="-Wl,$LIBDB"
+	LIBDB="$LIBDB"
 	;;
 *)
 	COURIERTCPD=""