--- courier/configure.orig	2009-09-05 13:59:59.000000000 +0200
+++ courier/configure	2010-02-15 20:05:20.000000000 +0100
@@ -819,6 +819,7 @@
 dirlist
 transport
 MODE
+piddir
 COPYRIGHT
 testmode
 COURIERAUTHCONFIG
@@ -954,6 +955,7 @@
 enable_libtool_lock
 with_softlinkdir
 with_testmode
+with_piddir
 with_transport
 with_db
 with_courierlogger
@@ -1629,6 +1631,7 @@
   --with-softlinks=dir:link,dir:link...   specify soft links for
                                           installation subdirectories.
  -- This space intentionally left blank --
+  --with-piddir         Directory where webmlm.pid is created
   --with-transport='local esmtp ...'
                           Specify list of modules to install
 
@@ -2553,7 +2556,7 @@
 fi
 
 fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="install  -s -o root -g wheel -m 555 -s"
 
 { $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
@@ -15882,6 +15885,14 @@
 esac
 
 
+# Check whether --with-piddir was given.
+if test "${with_piddir+set}" = set; then
+  withval=$with_piddir; piddir="$withval"
+  else
+    piddir=$localstatedir/run
+fi
+
+
 version=`cat ../version`
 
 COPYRIGHT="Courier $version Copyright 1999-2008 Double Precision, Inc."
@@ -18397,9 +18408,9 @@
 
 if test "$testmode" = "0"
 then
-	INSTALL_PROGRAM='${INSTALL} -m 700'
-	INSTALL_SCRIPT='${INSTALL} -m 700'
-	INSTALL_DATA='${INSTALL} -m 600'
+	INSTALL_PROGRAM='${BSD_INSTALL_PROGRAM}'
+	INSTALL_SCRIPT='${BSD_INSTALL_SCRIPT}'
+	INSTALL_DATA='${BSD_INSTALL_DATA}'
 fi
 
 ac_ext=cpp