diff -ruN courier-imap-4.7.0-orig/bdbobj/Makefile.in courier-imap-4.7.0/bdbobj/Makefile.in --- courier-imap-4.7.0-orig/bdbobj/Makefile.in 2009-11-22 14:44:45.000000000 +0000 +++ courier-imap-4.7.0/bdbobj/Makefile.in 2010-02-24 22:41:57.787849116 +0000 @@ -238,7 +238,6 @@ @FOUND_DB_TRUE@testbdb_SOURCES = $(TESTBDBSOURCES) @FOUND_DB_TRUE@testbdb_DEPENDENCIES = libbdbobj.la @FOUND_DB_TRUE@testbdb_LDADD = libbdbobj.la -@FOUND_DB_TRUE@testbdb_LDFLAGS = -static @FOUND_DB_FALSE@noinst_SCRIPTS = notfound EXTRA_DIST = $(LIBDBOBJSOURCES) $(TESTBDBSOURCES) testsuite testsuite.txt all: config.h diff -ruN courier-imap-4.7.0-orig/gdbmobj/Makefile.in courier-imap-4.7.0/gdbmobj/Makefile.in --- courier-imap-4.7.0-orig/gdbmobj/Makefile.in 2009-11-22 14:44:52.000000000 +0000 +++ courier-imap-4.7.0/gdbmobj/Makefile.in 2010-02-24 22:41:57.791849297 +0000 @@ -239,7 +239,6 @@ @FOUND_GDBM_TRUE@testgdbm_SOURCES = $(TESTGDBMSOURCES) @FOUND_GDBM_TRUE@testgdbm_DEPENDENCIES = libgdbmobj.la @FOUND_GDBM_TRUE@testgdbm_LDADD = libgdbmobj.la -@FOUND_GDBM_TRUE@testgdbm_LDFLAGS = -static @FOUND_GDBM_FALSE@noinst_SCRIPTS = notfound EXTRA_DIST = $(LIBGDBMSOURCES) $(TESTGDBMSOURCES) testsuite testsuite.txt all: config.h diff -ruN courier-imap-4.7.0-orig/imap/Makefile.in courier-imap-4.7.0/imap/Makefile.in --- courier-imap-4.7.0-orig/imap/Makefile.in 2009-12-25 22:08:53.000000000 +0000 +++ courier-imap-4.7.0/imap/Makefile.in 2010-02-24 22:41:57.795849478 +0000 @@ -306,7 +306,6 @@ libimaplogin_la_LIBADD = ../tcpd/libspipe.la ../tcpd/libtlsclient.la \ ../numlib/libnumlib.la -libimaplogin_la_LDFLAGS = -static libimapd_la_SOURCES = mainloop.c imaptoken.c imaptoken.h imapwrite.c \ imapwrite.h capability.c externalauth.c smap.c smapsnapshot.c @@ -314,7 +313,6 @@ ../rfc822/librfc822.la ../liblock/liblock.la ../numlib/libnumlib.la \ ../unicode/libunicode.la -libimapd_la_LDFLAGS = -static imaplogin_SOURCES = imaplogin.c authenticate_auth.c proxy.c proxy.h imaplogin_DEPENDENCIES = libimapd.la libimaplogin.la imaplogin_LDADD = libimapd.la libimaplogin.la \ @@ -344,7 +342,6 @@ ../numlib/libnumlib.la libpop3d_la_DEPENDENCIES = $(libpop3d_la_LIBADD) -libpop3d_la_LDFLAGS = -static pop3d_SOURCES = pop3dserver.c pop3dcapa.c pop3d_DEPENDENCIES = libpop3d.la pop3d_LDADD = libpop3d.la @LDAUTH@ -lcourierauth diff -ruN courier-imap-4.7.0-orig/libhmac/Makefile.in courier-imap-4.7.0/libhmac/Makefile.in --- courier-imap-4.7.0-orig/libhmac/Makefile.in 2009-11-22 14:45:03.000000000 +0000 +++ courier-imap-4.7.0/libhmac/Makefile.in 2010-02-24 22:41:57.795849478 +0000 @@ -222,11 +222,9 @@ md5hmactest_SOURCES = md5hmactest.c md5hmactest_DEPENDENCIES = libhmac.la @hashlibs@ md5hmactest_LDADD = $(md5hmactest_DEPENDENCIES) -md5hmactest_LDFLAGS = -static sha1hmactest_SOURCES = sha1hmactest.c sha1hmactest_DEPENDENCIES = libhmac.la @hashlibs@ sha1hmactest_LDADD = $(sha1hmactest_DEPENDENCIES) -sha1hmactest_LDFLAGS = -static EXTRA_DIST = md5hmactest.txt sha1hmactest.txt all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am diff -ruN courier-imap-4.7.0-orig/liblock/Makefile.in courier-imap-4.7.0/liblock/Makefile.in --- courier-imap-4.7.0-orig/liblock/Makefile.in 2009-11-22 14:45:09.000000000 +0000 +++ courier-imap-4.7.0/liblock/Makefile.in 2010-02-24 22:41:57.799849658 +0000 @@ -228,7 +228,6 @@ lockmail_SOURCES = lockmail.c lockmail_DEPENDENCIES = liblock.la ../numlib/libnumlib.la lockmail_LDADD = liblock.la ../numlib/libnumlib.la -lockmail_LDFLAGS = -static noinst_DATA = lockmail.html lockmail.1 EXTRA_DIST = lockfcntl.c lockflock.c locklockf.c locktest.c $(noinst_DATA) all: config.h diff -ruN courier-imap-4.7.0-orig/maildir/Makefile.in courier-imap-4.7.0/maildir/Makefile.in --- courier-imap-4.7.0-orig/maildir/Makefile.in 2009-11-22 14:45:16.000000000 +0000 +++ courier-imap-4.7.0/maildir/Makefile.in 2010-02-24 22:41:57.803849839 +0000 @@ -327,7 +327,6 @@ ../numlib/libnumlib.la deliverquota_LDADD = libmaildir.la ../rfc822/librfc822.la ../numlib/libnumlib.la -deliverquota_LDFLAGS = -static maildirmake_SOURCES = maildirmake.c maildirmake_DEPENDENCIES = libmaildir.la ../numlib/libnumlib.la \ ../rfc822/librfc822.la @@ -335,15 +334,12 @@ maildirmake_LDADD = libmaildir.la ../numlib/libnumlib.la \ ../rfc822/librfc822.la -maildirmake_LDFLAGS = -static testmaildirfilter_SOURCES = maildirfiltertypelist.h testmaildirfilter.c testmaildirfilter_DEPENDENCIES = libmaildir.la ../numlib/libnumlib.la testmaildirfilter_LDADD = libmaildir.la ../numlib/libnumlib.la @LIBPCRE@ -testmaildirfilter_LDFLAGS = -static maildirkwtest_SOURCES = maildirkwtest.c maildirkwtest_LDADD = libmaildir.la maildirkwtest_DEPENDENCIES = libmaildir.la -maildirkwtest_LDFLAGS = -static maildirkw_SOURCES = maildirkw.c maildirkw_LDADD = libmaildir.la ../liblock/liblock.la ../numlib/libnumlib.la \ `cat maildir.libdeps` @@ -351,7 +347,6 @@ maildirkw_DEPENDENCIES = libmaildir.la ../liblock/liblock.la \ ../numlib/libnumlib.la maildir.libdeps -maildirkw_LDFLAGS = -static maildiracl = maildiracl.c maildiracl_LDADD = libmaildir.la ../liblock/liblock.la ../numlib/libnumlib.la \ `cat maildir.libdeps` @@ -359,7 +354,6 @@ maildiracl_DEPENDENCIES = libmaildir.la ../liblock/liblock.la \ ../numlib/libnumlib.la maildir.libdeps -maildiracl_LDFLAGS = -static maildiraclttest_SOURCES = testmaildiraclt.c maildiraclttest_LDADD = libmaildir.la ../liblock/liblock.la \ ../numlib/libnumlib.la `cat maildir.libdeps` @@ -367,7 +361,6 @@ maildiraclttest_DEPENDENCIES = libmaildir.la ../liblock/liblock.la \ ../numlib/libnumlib.la maildir.libdeps -maildiraclttest_LDFLAGS = -static EXTRA_DIST = README.maildirquota.html README.maildirquota.txt \ README.imapkeywords.html \ README.maildirfilter.html \ diff -ruN courier-imap-4.7.0-orig/makedat/Makefile.in courier-imap-4.7.0/makedat/Makefile.in --- courier-imap-4.7.0-orig/makedat/Makefile.in 2009-11-22 14:45:22.000000000 +0000 +++ courier-imap-4.7.0/makedat/Makefile.in 2010-02-24 22:41:57.803849839 +0000 @@ -210,7 +210,6 @@ makedatprog_SOURCES = makedatprog.c makedatprog_DEPENDENCIES = @dblibrary@ makedatprog_LDADD = @dblibrary@ -makedatprog_LDFLAGS = -static all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am diff -ruN courier-imap-4.7.0-orig/md5/Makefile.in courier-imap-4.7.0/md5/Makefile.in --- courier-imap-4.7.0-orig/md5/Makefile.in 2009-11-22 14:45:27.000000000 +0000 +++ courier-imap-4.7.0/md5/Makefile.in 2010-02-24 22:41:57.807850020 +0000 @@ -218,7 +218,6 @@ md5test_SOURCES = md5test.c md5test_DEPENDENCIES = libmd5.la md5test_LDADD = libmd5.la -md5test_LDFLAGS = -static EXTRA_DIST = md5test.txt hmac.c all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am diff -ruN courier-imap-4.7.0-orig/rfc1035/Makefile.in courier-imap-4.7.0/rfc1035/Makefile.in --- courier-imap-4.7.0-orig/rfc1035/Makefile.in 2009-11-22 14:45:45.000000000 +0000 +++ courier-imap-4.7.0/rfc1035/Makefile.in 2010-02-24 22:41:57.807850020 +0000 @@ -249,7 +249,6 @@ testlookup_LDADD = librfc1035.a ../soxwrap/libsoxwrap.a ../md5/libmd5.la \ ../random128/librandom128.la `cat ../soxwrap/soxlibs.dep` -testlookup_LDFLAGS = -static EXTRA_DIST = testsuite.txt testspf_SOURCES = testspf.c testspf_DEPENDENCIES = librfc1035.a ../md5/libmd5.la \ @@ -260,7 +259,6 @@ ../random128/librandom128.la ../soxwrap/libsoxwrap.a \ `cat ../soxwrap/soxlibs.dep` -testspf_LDFLAGS = -static all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am diff -ruN courier-imap-4.7.0-orig/rfc2045/Makefile.in courier-imap-4.7.0/rfc2045/Makefile.in --- courier-imap-4.7.0-orig/rfc2045/Makefile.in 2009-11-22 21:22:32.000000000 +0000 +++ courier-imap-4.7.0/rfc2045/Makefile.in 2010-02-24 22:41:57.811850201 +0000 @@ -257,17 +257,14 @@ ../unicode/libunicode.la ../numlib/libnumlib.la reformime_DEPENDENCIES = $(reformime_LDADD) -reformime_LDFLAGS = -static makemime_SOURCES = makemime.c makemime_LDADD = ../rfc822/libencode.la ../rfc822/librfc822.la librfc2045.la ../unicode/libunicode.la ../numlib/libnumlib.la ../unicode/libunicode.la makemime_DEPENDENCIES = $(makemime_LDADD) -makemime_LDFLAGS = -static headercheck_SOURCES = headercheck.c headercheck_LDADD = librfc2045.la ../rfc822/librfc822.la ../numlib/libnumlib.la \ ../unicode/libunicode.la headercheck_DEPENDENCIES = $(headercheck_LDADD) -headercheck_LDFLAGS = -static all: $(BUILT_SOURCES) rfc2045_config.h $(MAKE) $(AM_MAKEFLAGS) all-am diff -ruN courier-imap-4.7.0-orig/rfc822/Makefile.in courier-imap-4.7.0/rfc822/Makefile.in --- courier-imap-4.7.0-orig/rfc822/Makefile.in 2009-11-22 21:22:30.000000000 +0000 +++ courier-imap-4.7.0/rfc822/Makefile.in 2010-02-24 22:41:57.815850381 +0000 @@ -240,11 +240,9 @@ testsuite_SOURCES = testsuite.c testsuite_DEPENDENCIES = librfc822.la testsuite_LDADD = librfc822.la -testsuite_LDFLAGS = -static reftest_SOURCES = reftest.c imaprefs.h reftest_DEPENDENCIES = librfc822.la ../unicode/libunicode.la reftest_LDADD = librfc822.la ../unicode/libunicode.la -reftest_LDFLAGS = -static EXTRA_DIST = testsuite.txt reftest.txt $(BUILT_SOURCES) all: $(BUILT_SOURCES) config.h $(MAKE) $(AM_MAKEFLAGS) all-am diff -ruN courier-imap-4.7.0-orig/sha1/Makefile.in courier-imap-4.7.0/sha1/Makefile.in --- courier-imap-4.7.0-orig/sha1/Makefile.in 2009-11-22 14:46:00.000000000 +0000 +++ courier-imap-4.7.0/sha1/Makefile.in 2010-02-24 22:41:57.815850381 +0000 @@ -218,7 +218,6 @@ testsuite_SOURCES = testsuite.c testsuite_DEPENDENCIES = libsha1.la testsuite_LDADD = $(testsuite_DEPENDENCIES) -testsuite_LDFLAGS = -static EXTRA_DIST = testsuite.txt hmac.c all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am diff -ruN courier-imap-4.7.0-orig/tcpd/Makefile.in courier-imap-4.7.0/tcpd/Makefile.in --- courier-imap-4.7.0-orig/tcpd/Makefile.in 2009-11-22 14:46:09.000000000 +0000 +++ courier-imap-4.7.0/tcpd/Makefile.in 2010-02-24 22:41:57.819850562 +0000 @@ -291,11 +291,9 @@ ../md5/libmd5.la ../random128/librandom128.la \ $(couriertcpd_t:%=-Wl,%) -couriertcpd_LDFLAGS = -static tlscachetest_SOURCES = tlscachetest.c tlscachetest_DEPENDENCIES = ../numlib/libnumlib.la ../liblock/liblock.la tlscachetest_LDADD = ../numlib/libnumlib.la ../liblock/liblock.la -tlscachetest_LDFLAGS = -static libspipe_la_SOURCES = spipe.c spipe.h couriertls_SOURCES = starttls.c argparse.c argparse.h couriertls_t = @soxdep@ @@ -309,7 +307,6 @@ ../numlib/libnumlib.la ../liblock/liblock.la \ ../soxwrap/libsoxwrap.a $(couriertls_t:%=-Wl,%) -couriertls_LDFLAGS = -static libcouriertlsopenssl_la_SOURCES = libcouriertls.c libcouriertls.h tlsinfo.c libcouriertlsopenssl_la_LIBADD = @openssldep@ libcouriertlsgnutls_la_SOURCES = libcouriergnutls.c tlsinfo.c diff -ruN courier-imap-4.7.0-orig/unicode/Makefile.in courier-imap-4.7.0/unicode/Makefile.in --- courier-imap-4.7.0-orig/unicode/Makefile.in 2009-11-22 14:46:15.000000000 +0000 +++ courier-imap-4.7.0/unicode/Makefile.in 2010-02-24 22:41:57.823850743 +0000 @@ -235,7 +235,6 @@ unicode_info_SOURCES = unicodeinfo.c unicode_info_DEPENDENCIES = libunicode.la unicode_info_LDADD = libunicode.la -unicode_info_LDFLAGS = -static ISO8859CFILES = iso88591.c iso88592.c iso88593.c iso88594.c iso88595.c\ iso88596.c iso88597.c iso88598.c iso88599.c iso885910.c iso885913.c\ iso885914.c iso885915.c