--- courier-imap-4.3.1/imap/configure.p6	2008-03-23 23:47:08 +1000
+++ courier-imap-4.3.1/imap/configure	2008-04-27 12:51:42 +1100
@@ -715,7 +715,7 @@ ac_hostname=`(hostname || uname -n) 2>/d
 #
 # Initializations.
 #
-ac_default_prefix=/usr/local
+ac_default_prefix=/usr
 ac_clean_files=
 ac_config_libobj_dir=.
 LIBOBJS=
@@ -19977,7 +19977,7 @@ fi
 
 
 
-OPENSSL_PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin:/usr/local/bin
+OPENSSL_PATH=$PATH:/sbin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin
 
 for ac_prog in openssl
 do
@@ -20027,7 +20027,7 @@ done
 
 if test "$OPENSSL" = ""
 then
-	OPENSSL=/usr/local/bin/openssl
+	OPENSSL=/usr/bin/openssl
 fi
 
 
@@ -20079,7 +20079,7 @@ done
 
 if test "$CERTTOOL" = ""
 then
-	CERTTOOL=/usr/local/bin/certtool
+	CERTTOOL=/usr/bin/certtool
 fi
 
 
--- courier-imap-4.3.1/tcpd/configure.p6	2007-11-19 03:24:21 +1000
+++ courier-imap-4.3.1/tcpd/configure	2008-04-27 12:49:03 +1100
@@ -19736,14 +19736,14 @@ gdbm)
 	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=""