diff --git a/altermime-x/default.configure b/altermime-x/default.configure
index 89e1fca6c..f6fa6dd23 100755
--- a/altermime-x/default.configure
+++ b/altermime-x/default.configure
@@ -21,13 +21,35 @@ esac
 if [ ! -d m4 -a -f configure.ac -a -f Makefile.am ] ; then
   mkdir -p m4
 fi
-if [ ! -f ./configure -o ! -f Makefile -o ! -f Makefile.in ] ; then
-  autoreconf -fiv
-fi
 if [ ! -f conf-release ] ; then
   echo "1.1" > conf-release
 fi
-if [ -f Makefile ] ; then
+
+force=0
+while test $# -gt 0; do
+  case "$1" in
+  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'`
+  ;;
+  *) optarg=
+  ;;
+  esac
+
+  case "$1" in
+  --force)
+  force=1
+  ;;
+  *)
+  echo "invalid option [$1]"
+  read key
+  exit 1
+  ;;
+  esac
+  shift
+done
+if [ $force -eq 1 -o ! -f ./configure -o ! -f Makefile -o ! -f Makefile.in -o ! -f depcomp ] ; then
+  autoreconf -fiv
+fi
+if [ $force -eq 0 -a -f Makefile ] ; then
   case "$SYSTEM" in
     Darwin|FreeBSD)
     if [ $(stat -f %m configure.ac) -le $(stat -f %m Makefile) ] ; then
diff --git a/bogofilter-wordlist-x/default.configure b/bogofilter-wordlist-x/default.configure
index 631acdc43..7ad61a0f8 100755
--- a/bogofilter-wordlist-x/default.configure
+++ b/bogofilter-wordlist-x/default.configure
@@ -25,10 +25,32 @@ if [ ! -f conf-releae ] ; then
   echo 1.1 > conf-release
 fi
 ./download.sh
-if [ ! -f ./configure -o ! -f Makefile -o ! -f Makefile.in ] ; then
+
+force=0
+while test $# -gt 0; do
+  case "$1" in
+  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'`
+  ;;
+  *) optarg=
+  ;;
+  esac
+
+  case "$1" in
+  --force)
+  force=1
+  ;;
+  *)
+  echo "invalid option [$1]"
+  read key
+  exit 1
+  ;;
+  esac
+  shift
+done
+if [ $force -eq 1 -o ! -f ./configure -o ! -f Makefile -o ! -f Makefile.in -o ! -f depcomp ] ; then
   autoreconf -fiv
 fi
-if [ -f Makefile ] ; then
+if [ $force -eq 0 -a -f Makefile ] ; then
   case "$SYSTEM" in
     Darwin|FreeBSD)
     if [ $(stat -f %m configure.ac) -le $(stat -f %m Makefile) ] ; then
diff --git a/courier-imap-x/default.configure b/courier-imap-x/default.configure
index 468244f41..b3ba137d5 100755
--- a/courier-imap-x/default.configure
+++ b/courier-imap-x/default.configure
@@ -73,6 +73,20 @@ case "$SYSTEM" in
   extra="--with-authpam"
   ;;
 esac
+
+if [ ! -f conf-release ] ; then
+  echo "1.1" > conf-release
+fi
+if [ ! -d m4 -a -f configure.ac -a -f Makefile.am ] ; then
+  mkdir -p m4
+fi
+for i in imap authlib maildrop unicode rfc2045 maildir
+do
+  if [ ! -d libs/$i/m4 ] ; then
+    mkdir -p libs/$i/m4
+  fi
+done
+
 force=0
 while test $# -gt 0; do
   case "$1" in
@@ -95,18 +109,6 @@ while test $# -gt 0; do
   shift
 done
 
-if [ ! -f conf-release ] ; then
-  echo "1.1" > conf-release
-fi
-if [ ! -d m4 -a -f configure.ac -a -f Makefile.am ] ; then
-  mkdir -p m4
-fi
-for i in imap authlib maildrop unicode rfc2045 maildir
-do
-  if [ ! -d libs/$i/m4 ] ; then
-    mkdir -p libs/$i/m4
-  fi
-done
 if [ $force -eq 1 -o ! -f ./configure -o ! -f Makefile -o ! -f Makefile.in -o ! -f depcomp ] ; then
   autoreconf -fiv
 fi
diff --git a/fetchmail-x/default.configure b/fetchmail-x/default.configure
index 88957026c..67ad88c06 100755
--- a/fetchmail-x/default.configure
+++ b/fetchmail-x/default.configure
@@ -1,10 +1,4 @@
 #!/bin/sh
-if [ ! -f ./configure -o ! -f Makefile -o ! -f Makefile.in ] ; then
-  autoreconf -fiv
-fi
-if [ ! -f conf-release ] ; then
-  echo 1.1 > conf-release
-fi
 SYSTEM=$(uname -s)
 case "$SYSTEM" in
   FreeBSD)
@@ -49,10 +43,39 @@ case "$SYSTEM" in
   extra_args="--with-ssl"
   ;;
 esac
+
 if [ ! -d m4 -a -f configure.ac -a -f Makefile.am ] ; then
   mkdir -p m4
 fi
-if [ -f Makefile ] ; then
+if [ ! -f conf-release ] ; then
+  echo 1.1 > conf-release
+fi
+
+force=0
+while test $# -gt 0; do
+  case "$1" in
+  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'`
+  ;;
+  *) optarg=
+  ;;
+  esac
+
+  case "$1" in
+  --force)
+  force=1
+  ;;
+  *)
+  echo "invalid option [$1]"
+  read key
+  exit 1
+  ;;
+  esac
+  shift
+done
+if [ $force -eq 1 -o ! -f ./configure -o ! -f Makefile -o ! -f Makefile.in -o ! -f depcomp ] ; then
+  autoreconf -fiv
+fi
+if [ $force -eq 0 -a -f Makefile ] ; then
   case "$SYSTEM" in
     Darwin|FreeBSD)
     if [ $(stat -f %m configure.ac) -le $(stat -f %m Makefile) ] ; then
@@ -60,6 +83,7 @@ if [ -f Makefile ] ; then
       exit 0
     fi
     ;;
+
     *)
     if [ $(stat --format %Y configure.ac) -le $(stat --format %Y Makefile) ] ; then
       echo "Already configured"
diff --git a/flash-x/default.configure b/flash-x/default.configure
index 711546268..ef9c948c9 100755
--- a/flash-x/default.configure
+++ b/flash-x/default.configure
@@ -1,10 +1,4 @@
 #!/bin/sh
-if [ ! -f ./configure -o ! -f Makefile -o ! -f Makefile.in ] ; then
-  autoreconf -fiv
-fi
-if [ ! -f conf-release ] ; then
-  echo 1.1 > conf-release
-fi
 SYSTEM=$(uname -s)
 case "$SYSTEM" in
   FreeBSD)
@@ -53,7 +47,35 @@ esac
 if [ ! -d m4 -a -f configure.ac -a -f Makefile.am ] ; then
   mkdir -p m4
 fi
-if [ -f Makefile ] ; then
+if [ ! -f conf-release ] ; then
+  echo 1.1 > conf-release
+fi
+
+force=0
+while test $# -gt 0; do
+  case "$1" in
+  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'`
+  ;;
+  *) optarg=
+  ;;
+  esac
+
+  case "$1" in
+  --force)
+  force=1
+  ;;
+  *)
+  echo "invalid option [$1]"
+  read key
+  exit 1
+  ;;
+  esac
+  shift
+done
+if [ $force -eq 1 -o ! -f ./configure -o ! -f Makefile -o ! -f Makefile.in -o ! -f depcomp ] ; then
+  autoreconf -fiv
+fi
+if [ $force -eq 0 -a -f Makefile ] ; then
   case "$SYSTEM" in
     Darwin|FreeBSD)
     if [ $(stat -f %m configure.ac) -le $(stat -f %m Makefile) ] ; then
@@ -61,6 +83,7 @@ if [ -f Makefile ] ; then
       exit 0
     fi
     ;;
+
     *)
     if [ $(stat --format %Y configure.ac) -le $(stat --format %Y Makefile) ] ; then
       echo "Already configured"
diff --git a/fortune-x/default.configure b/fortune-x/default.configure
index a916ebb0c..50c3ec3be 100755
--- a/fortune-x/default.configure
+++ b/fortune-x/default.configure
@@ -1,10 +1,4 @@
 #!/bin/sh
-if [ ! -f ./configure -o ! -f Makefile -o ! -f Makefile.in ] ; then
-  autoreconf -fiv
-fi
-if [ ! -f conf-release ] ; then
-  echo 1.1 > conf-release
-fi
 SYSTEM=$(uname -s)
 case "$SYSTEM" in
   FreeBSD)
@@ -40,7 +34,35 @@ esac
 if [ ! -d m4 -a -f configure.ac -a -f Makefile.am ] ; then
   mkdir -p m4
 fi
-if [ -f Makefile ] ; then
+if [ ! -f conf-release ] ; then
+  echo 1.1 > conf-release
+fi
+
+force=0
+while test $# -gt 0; do
+  case "$1" in
+  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'`
+  ;;
+  *) optarg=
+  ;;
+  esac
+
+  case "$1" in
+  --force)
+  force=1
+  ;;
+  *)
+  echo "invalid option [$1]"
+  read key
+  exit 1
+  ;;
+  esac
+  shift
+done
+if [ $force -eq 1 -o ! -f ./configure -o ! -f Makefile -o ! -f Makefile.in -o ! -f depcomp ] ; then
+  autoreconf -fiv
+fi
+if [ $force -eq 0 -a -f Makefile ] ; then
   case "$SYSTEM" in
     Darwin|FreeBSD)
     if [ $(stat -f %m configure.ac) -le $(stat -f %m Makefile) ] ; then
@@ -48,6 +70,7 @@ if [ -f Makefile ] ; then
       exit 0
     fi
     ;;
+
     *)
     if [ $(stat --format %Y configure.ac) -le $(stat --format %Y Makefile) ] ; then
       echo "Already configured"
diff --git a/indimail-spamfilter-x/default.configure b/indimail-spamfilter-x/default.configure
index 759811a9a..68637d3fd 100755
--- a/indimail-spamfilter-x/default.configure
+++ b/indimail-spamfilter-x/default.configure
@@ -1,12 +1,4 @@
 #!/bin/sh
-echo "default.configure called with $# args [$*]"
-prefix=/usr
-if [ ! -f ./configure -o ! -f Makefile -o ! -f Makefile.in ] ; then
-  autoreconf -fiv
-fi
-if [ ! -f conf-release ] ; then
-  echo 1.1 > conf-release
-fi
 SYSTEM=$(uname -s)
 case "$SYSTEM" in
   FreeBSD)
@@ -69,7 +61,37 @@ fi
 if [ ! -d m4 -a -f configure.ac -a -f Makefile.am ] ; then
   mkdir -p m4
 fi
-if [ -f Makefile ] ; then
+echo "default.configure called with $# args [$*]"
+prefix=/usr
+if [ ! -f conf-release ] ; then
+  echo 1.1 > conf-release
+fi
+
+force=0
+while test $# -gt 0; do
+  case "$1" in
+  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'`
+  ;;
+  *) optarg=
+  ;;
+  esac
+
+  case "$1" in
+  --force)
+  force=1
+  ;;
+  *)
+  echo "invalid option [$1]"
+  read key
+  exit 1
+  ;;
+  esac
+  shift
+done
+if [ $force -eq 1 -o ! -f ./configure -o ! -f Makefile -o ! -f Makefile.in -o ! -f depcomp ] ; then
+  autoreconf -fiv
+fi
+if [ $force -eq 0 -a -f Makefile ] ; then
   case "$SYSTEM" in
     Darwin|FreeBSD)
     if [ $(stat -f %m configure.ac) -le $(stat -f %m Makefile) ] ; then
@@ -77,6 +99,7 @@ if [ -f Makefile ] ; then
       exit 0
     fi
     ;;
+
     *)
     if [ $(stat --format %Y configure.ac) -le $(stat --format %Y Makefile) ] ; then
       echo "Already configured"
diff --git a/indimail-x/default.configure b/indimail-x/default.configure
index f7aa5b62d..7958abcca 100755
--- a/indimail-x/default.configure
+++ b/indimail-x/default.configure
@@ -65,6 +65,14 @@ case "$SYSTEM" in
   base_path=/mail
   ;;
 esac
+
+if [ ! -d m4 -a -f configure.ac -a -f Makefile.am ] ; then
+  mkdir -p m4
+fi
+if [ ! -f conf-release ] ; then
+  echo 1.1 > conf-release
+fi
+
 force=0
 while test $# -gt 0; do
   case "$1" in
@@ -86,9 +94,6 @@ while test $# -gt 0; do
   esac
   shift
 done
-if [ ! -f conf-release ] ; then
-  echo 1.1 > conf-release
-fi
 
 if [ -d $prefix/include/mysql ] ; then
   mysqlPrefix=$prefix
@@ -98,10 +103,6 @@ elif [ -d /usr/local/mysql/include ] ; then
   mysqlPrefix=/usr/local/mysql
 fi
 
-if [ ! -d m4 -a -f configure.ac -a -f Makefile.am ] ; then
-  mkdir -p m4
-fi
-
 if [ $force -eq 1 -o ! -f ./configure -o ! -f Makefile -o ! -f Makefile.in -o ! -f depcomp ] ; then
   autoreconf -fiv
 fi
diff --git a/indium-x/default.configure b/indium-x/default.configure
index 2d56204c5..020618c9a 100755
--- a/indium-x/default.configure
+++ b/indium-x/default.configure
@@ -1,10 +1,4 @@
 #!/bin/sh
-if [ ! -f ./configure -o ! -f Makefile -o ! -f Makefile.in ] ; then
-autoreconf -fiv
-fi
-if [ ! -f conf-release ] ; then
-  echo 1.1 > conf-release
-fi
 SYSTEM=$(uname -s)
 case "$SYSTEM" in
   FreeBSD)
@@ -50,18 +44,39 @@ case "$SYSTEM" in
   libdir=/usr/lib
   ;;
 esac
-if [ -d $prefix/include/mysql ] ; then
-  mysqlPrefix=$prefix
-elif [ -d /usr/local/include/mysql ] ; then
-  mysqlPrefix=/usr/local
-elif [ -d /usr/local/mysql/include ] ; then
-  mysqlPrefix=/usr/local/mysql
-fi
 
 if [ ! -d m4 -a -f configure.ac -a -f Makefile.am ] ; then
   mkdir -p m4
 fi
-if [ -f Makefile ] ; then
+if [ ! -f conf-release ] ; then
+  echo 1.1 > conf-release
+fi
+
+force=0
+while test $# -gt 0; do
+  case "$1" in
+  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'`
+  ;;
+  *) optarg=
+  ;;
+  esac
+
+  case "$1" in
+  --force)
+  force=1
+  ;;
+  *)
+  echo "invalid option [$1]"
+  read key
+  exit 1
+  ;;
+  esac
+  shift
+done
+if [ $force -eq 1 -o ! -f ./configure -o ! -f Makefile -o ! -f Makefile.in -o ! -f depcomp ] ; then
+  autoreconf -fiv
+fi
+if [ $force -eq 0 -a -f Makefile ] ; then
   case "$SYSTEM" in
     Darwin|FreeBSD)
     if [ $(stat -f %m configure.ac) -le $(stat -f %m Makefile) ] ; then
@@ -78,6 +93,14 @@ if [ -f Makefile ] ; then
     ;;
   esac
 fi
+
+if [ -d $prefix/include/mysql ] ; then
+  mysqlPrefix=$prefix
+elif [ -d /usr/local/include/mysql ] ; then
+  mysqlPrefix=/usr/local
+elif [ -d /usr/local/mysql/include ] ; then
+  mysqlPrefix=/usr/local/mysql
+fi
 ./configure --prefix=$prefix \
   --libexecdir=$prefix/libexec/indimail \
   --libdir=$libdir \
diff --git a/ircube-x/default.configure b/ircube-x/default.configure
index 0ad10e55c..0415cad5d 100755
--- a/ircube-x/default.configure
+++ b/ircube-x/default.configure
@@ -1,10 +1,4 @@
 #!/bin/sh
-if [ ! -f ./configure -o ! -f Makefile -o ! -f Makefile.in ] ; then
-  autoreconf -fiv
-fi
-if [ ! -f conf-release ] ; then
-  echo 1.1 > conf-release
-fi
 SYSTEM=$(uname -s)
 case "$SYSTEM" in
   FreeBSD)
@@ -32,7 +26,35 @@ esac
 if [ ! -d m4 -a -f configure.ac -a -f Makefile.am ] ; then
   mkdir -p m4
 fi
-if [ -f Makefile ] ; then
+if [ ! -f conf-release ] ; then
+  echo 1.1 > conf-release
+fi
+
+force=0
+while test $# -gt 0; do
+  case "$1" in
+  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'`
+  ;;
+  *) optarg=
+  ;;
+  esac
+
+  case "$1" in
+  --force)
+  force=1
+  ;;
+  *)
+  echo "invalid option [$1]"
+  read key
+  exit 1
+  ;;
+  esac
+  shift
+done
+if [ $force -eq 1 -o ! -f ./configure -o ! -f Makefile -o ! -f Makefile.in -o ! -f depcomp ] ; then
+  autoreconf -fiv
+fi
+if [ $force -eq 0 -a -f Makefile ] ; then
   case "$SYSTEM" in
     Darwin|FreeBSD)
     if [ $(stat -f %m configure.ac) -le $(stat -f %m Makefile) ] ; then
diff --git a/iwebadmin-x/default.configure b/iwebadmin-x/default.configure
index 73510be87..f4475cbbd 100755
--- a/iwebadmin-x/default.configure
+++ b/iwebadmin-x/default.configure
@@ -1,10 +1,4 @@
 #!/bin/sh
-if [ ! -f ./configure -o ! -f Makefile -o ! -f Makefile.in ] ; then
-  autoreconf -fiv
-fi
-if [ ! -f conf-release ] ; then
-  echo 1.1 > conf-release
-fi
 SYSTEM=$(uname -s)
 case "$SYSTEM" in
   FreeBSD)
@@ -44,7 +38,35 @@ esac
 if [ ! -d m4 -a -f configure.ac -a -f Makefile.am ] ; then
   mkdir -p m4
 fi
-if [ -f Makefile ] ; then
+if [ ! -f conf-release ] ; then
+  echo 1.1 > conf-release
+fi
+
+force=0
+while test $# -gt 0; do
+  case "$1" in
+  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'`
+  ;;
+  *) optarg=
+  ;;
+  esac
+
+  case "$1" in
+  --force)
+  force=1
+  ;;
+  *)
+  echo "invalid option [$1]"
+  read key
+  exit 1
+  ;;
+  esac
+  shift
+done
+if [ $force -eq 1 -o ! -f ./configure -o ! -f Makefile -o ! -f Makefile.in -o ! -f depcomp ] ; then
+  autoreconf -fiv
+fi
+if [ $force -eq 0 -a -f Makefile ] ; then
   case "$SYSTEM" in
     Darwin|FreeBSD)
     if [ $(stat -f %m configure.ac) -le $(stat -f %m Makefile) ] ; then
diff --git a/logalert-x/default.configure b/logalert-x/default.configure
index 52459448c..b3751d65d 100755
--- a/logalert-x/default.configure
+++ b/logalert-x/default.configure
@@ -34,13 +34,35 @@ esac
 if [ ! -d m4 -a -f configure.ac -a -f Makefile.am ] ; then
   mkdir -p m4
 fi
-if [ ! -f ./configure -o ! -f Makefile -o ! -f Makefile.in ] ; then
-  autoreconf -fiv
-fi
 if [ ! -f conf-release ] ; then
   echo 1.1 > conf-release
 fi
-if [ -f Makefile ] ; then
+
+force=0
+while test $# -gt 0; do
+  case "$1" in
+  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'`
+  ;;
+  *) optarg=
+  ;;
+  esac
+
+  case "$1" in
+  --force)
+  force=1
+  ;;
+  *)
+  echo "invalid option [$1]"
+  read key
+  exit 1
+  ;;
+  esac
+  shift
+done
+if [ $force -eq 1 -o ! -f ./configure -o ! -f Makefile -o ! -f Makefile.in -o ! -f depcomp ] ; then
+  autoreconf -fiv
+fi
+if [ $force -eq 0 -a -f Makefile ] ; then
   case "$SYSTEM" in
     Darwin|FreeBSD)
     if [ $(stat -f %m configure.ac) -le $(stat -f %m Makefile) ] ; then
diff --git a/mpack-x/default.configure b/mpack-x/default.configure
index 1a13d5199..c43933938 100755
--- a/mpack-x/default.configure
+++ b/mpack-x/default.configure
@@ -22,13 +22,35 @@ esac
 if [ ! -d m4 -a -f configure.ac -a -f Makefile.am ] ; then
   mkdir -p m4
 fi
-if [ ! -f ./configure -o ! -f Makefile -o ! -f Makefile.in ] ; then
-  autoreconf -fiv
-fi
 if [ ! -f conf-release ] ; then
   echo "1.1" > conf-release
 fi
-if [ -f Makefile ] ; then
+
+force=0
+while test $# -gt 0; do
+  case "$1" in
+  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'`
+  ;;
+  *) optarg=
+  ;;
+  esac
+
+  case "$1" in
+  --force)
+  force=1
+  ;;
+  *)
+  echo "invalid option [$1]"
+  read key
+  exit 1
+  ;;
+  esac
+  shift
+done
+if [ $force -eq 1 -o ! -f ./configure -o ! -f Makefile -o ! -f Makefile.in -o ! -f depcomp ] ; then
+  autoreconf -fiv
+fi
+if [ $force -eq 0 -a -f Makefile ] ; then
   case "$SYSTEM" in
     Darwin|FreeBSD)
     if [ $(stat -f %m configure.ac) -le $(stat -f %m Makefile) ] ; then
diff --git a/nssd-x/default.configure b/nssd-x/default.configure
index e0f3e9dcc..50f542a3c 100755
--- a/nssd-x/default.configure
+++ b/nssd-x/default.configure
@@ -43,31 +43,39 @@ case "$SYSTEM" in
   sysconfdir=/etc/indimail
   ;;
 esac
-if [ -d $prefix/include/mysql ] ; then
-  mysqlPrefix=$prefix
-elif [ -d /usr/local/include/mysql ] ; then
-  mysqlPrefix=/usr/local
-elif [ -d /usr/local/mysql/include ] ; then
-  mysqlPrefix=/usr/local/mysql
-fi
-if [ -d /run ] ; then
-  nssd_sock=/run/indimail/nssd.sock
-elif [ -d /var/run ] ; then
-  nssd_sock=/var/run/indimail/nssd.sock
-else
-  nssd_sock=/tmp/nssd.sock
-fi
 
 if [ ! -d m4 -a -f configure.ac -a -f Makefile.am ] ; then
   mkdir -p m4
 fi
-if [ ! -f ./configure -o ! -f Makefile -o ! -f Makefile.in ] ; then
-  autoreconf -fiv
-fi
 if [ ! -f conf-release ] ; then
   echo 1.1 > conf-release
 fi
-if [ -f Makefile ] ; then
+
+force=0
+while test $# -gt 0; do
+  case "$1" in
+  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'`
+  ;;
+  *) optarg=
+  ;;
+  esac
+
+  case "$1" in
+  --force)
+  force=1
+  ;;
+  *)
+  echo "invalid option [$1]"
+  read key
+  exit 1
+  ;;
+  esac
+  shift
+done
+if [ $force -eq 1 -o ! -f ./configure -o ! -f Makefile -o ! -f Makefile.in -o ! -f depcomp ] ; then
+  autoreconf -fiv
+fi
+if [ $force -eq 0 -a -f Makefile ] ; then
   case "$SYSTEM" in
     Darwin|FreeBSD)
     if [ $(stat -f %m configure.ac) -le $(stat -f %m Makefile) ] ; then
@@ -84,6 +92,21 @@ if [ -f Makefile ] ; then
     ;;
   esac
 fi
+
+if [ -d $prefix/include/mysql ] ; then
+  mysqlPrefix=$prefix
+elif [ -d /usr/local/include/mysql ] ; then
+  mysqlPrefix=/usr/local
+elif [ -d /usr/local/mysql/include ] ; then
+  mysqlPrefix=/usr/local/mysql
+fi
+if [ -d /run ] ; then
+  nssd_sock=/run/indimail/nssd.sock
+elif [ -d /var/run ] ; then
+  nssd_sock=/var/run/indimail/nssd.sock
+else
+  nssd_sock=/tmp/nssd.sock
+fi
 default_domain=$(echo $([ -n "$HOSTNAME" ] && echo "$HOSTNAME" || uname -n) | sed 's/^\([^\.]*\)\.\([^\.]*\)\./\2\./')
 ./configure --prefix=$prefix \
   --sbindir=$sbindir --mandir=$mandir \
diff --git a/pam-multi-x/default.configure b/pam-multi-x/default.configure
index 9a3e923ad..07b8f9ba7 100755
--- a/pam-multi-x/default.configure
+++ b/pam-multi-x/default.configure
@@ -46,24 +46,39 @@ case "$SYSTEM" in
   pam_confdir=/etc/pam.d
   ;;
 esac
-if [ -d $prefix/include/mysql ] ; then
-  mysqlPrefix=$prefix
-elif [ -d /usr/local/include/mysql ] ; then
-  mysqlPrefix=/usr/local
-elif [ -d /usr/local/mysql/include ] ; then
-  mysqlPrefix=/usr/local/mysql
-fi
 
 if [ ! -d m4 -a -f configure.ac -a -f Makefile.am ] ; then
   mkdir -p m4
 fi
-if [ ! -f ./configure -o ! -f Makefile -o ! -f Makefile.in ] ; then
-  autoreconf -fiv
-fi
 if [ ! -f conf-release ] ; then
   echo 1.1 > conf-release
 fi
-if [ -f Makefile ] ; then
+
+force=0
+while test $# -gt 0; do
+  case "$1" in
+  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'`
+  ;;
+  *) optarg=
+  ;;
+  esac
+
+  case "$1" in
+  --force)
+  force=1
+  ;;
+  *)
+  echo "invalid option [$1]"
+  read key
+  exit 1
+  ;;
+  esac
+  shift
+done
+if [ $force -eq 1 -o ! -f ./configure -o ! -f Makefile -o ! -f Makefile.in -o ! -f depcomp ] ; then
+  autoreconf -fiv
+fi
+if [ $force -eq 0 -a -f Makefile ] ; then
   case "$SYSTEM" in
     Darwin|FreeBSD)
     if [ $(stat -f %m configure.ac) -le $(stat -f %m Makefile) ] ; then
@@ -80,6 +95,13 @@ if [ -f Makefile ] ; then
     ;;
   esac
 fi
+if [ -d $prefix/include/mysql ] ; then
+  mysqlPrefix=$prefix
+elif [ -d /usr/local/include/mysql ] ; then
+  mysqlPrefix=/usr/local
+elif [ -d /usr/local/mysql/include ] ; then
+  mysqlPrefix=/usr/local/mysql
+fi
 default_domain=$(echo $([ -n "$HOSTNAME" ] && echo "$HOSTNAME" || uname -n) | sed 's/^\([^\.]*\)\.\([^\.]*\)\./\2\./')
 ./configure --prefix=$prefix \
   --datarootdir=$prefix/share/indimail \
diff --git a/procmail-x/default.configure b/procmail-x/default.configure
index b0c1d760c..262162827 100755
--- a/procmail-x/default.configure
+++ b/procmail-x/default.configure
@@ -34,13 +34,35 @@ esac
 if [ ! -d m4 -a -f configure.ac -a -f Makefile.am ] ; then
   mkdir -p m4
 fi
-if [ ! -f ./configure -o ! -f Makefile -o ! -f Makefile.in ] ; then
-  autoreconf -fiv
-fi
 if [ ! -f conf-release ] ; then
   echo 1.1 > conf-release
 fi
-if [ -f Makefile ] ; then
+
+force=0
+while test $# -gt 0; do
+  case "$1" in
+  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'`
+  ;;
+  *) optarg=
+  ;;
+  esac
+
+  case "$1" in
+  --force)
+  force=1
+  ;;
+  *)
+  echo "invalid option [$1]"
+  read key
+  exit 1
+  ;;
+  esac
+  shift
+done
+if [ $force -eq 1 -o ! -f ./configure -o ! -f Makefile -o ! -f Makefile.in -o ! -f depcomp ] ; then
+  autoreconf -fiv
+fi
+if [ $force -eq 0 -a -f Makefile ] ; then
   case "$SYSTEM" in
     Darwin|FreeBSD)
     if [ $(stat -f %m configure.ac) -le $(stat -f %m Makefile) ] ; then
diff --git a/ripmime-x/default.configure b/ripmime-x/default.configure
index 1e6ba473c..cce5416cb 100755
--- a/ripmime-x/default.configure
+++ b/ripmime-x/default.configure
@@ -24,13 +24,35 @@ esac
 if [ ! -d m4 -a -f configure.ac -a -f Makefile.am ] ; then
   mkdir -p m4
 fi
-if [ ! -f ./configure -o ! -f Makefile -o ! -f Makefile.in ] ; then
-  autoreconf -fiv
-fi
 if [ ! -f conf-release ] ; then
   echo 1.1 > conf-release
 fi
-if [ -f Makefile ] ; then
+
+force=0
+while test $# -gt 0; do
+  case "$1" in
+  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'`
+  ;;
+  *) optarg=
+  ;;
+  esac
+
+  case "$1" in
+  --force)
+  force=1
+  ;;
+  *)
+  echo "invalid option [$1]"
+  read key
+  exit 1
+  ;;
+  esac
+  shift
+done
+if [ $force -eq 1 -o ! -f ./configure -o ! -f Makefile -o ! -f Makefile.in -o ! -f depcomp ] ; then
+  autoreconf -fiv
+fi
+if [ $force -eq 0 -a -f Makefile ] ; then
   case "$SYSTEM" in
     Darwin|FreeBSD)
     if [ $(stat -f %m configure.ac) -le $(stat -f %m Makefile) ] ; then