Make /var/qmail installation optional

1 files changed, 13 insertions, 5 deletions

diff --git a/configure b/configure
index 0640b19..b1f3565 100755
--- a/configure
+++ b/configure
@@ -25,6 +25,7 @@ Fine tuning of the installation directories:
   --includedir=DIR              C header files [PREFIX/include]
   --sysconfdir=DIR              global configuration files [PREFIX/etc]
   --pkgconfdir=DIR              pkg-config .pc files [PREFIX/lib/pkgconfig]
+  --qmaildir=DIR                qmail installation directory [/var/qmail]
 
  If no --prefix option is given, by default libdir (but not dynlibdir) will be
  /usr/lib, and includedir will be /usr/include.
@@ -48,9 +49,9 @@ Optional features:
   --enable-pkgconfig            Build and install .pc files for pkg-config [disabled]
   --enable-slashpackage[=ROOT]  assume /package installation at ROOT [disabled]
   --enable-absolute-paths       hardcode absolute BINDIR/foobar paths in binaries [disabled]
-  --with-qmail-home=DIR       qmail installation directory [/var/qmail]
-  --with-qmailr-ids=uid:gid   qmail-remote user:group [qmailr:qmail]
-
+  --with-qmail-home=DIR         qmail installation directory [/var/qmail]
+  --with-qmailr-ids=uid:gid     qmail-remote user:group [qmailr:qmail]
+  --enable-qmail-install        setup qmail to use qmail-remote [disabled]
 EOF
 exit 0
 }
@@ -172,6 +173,7 @@ vpathd=''
 build=
 qmailhome=/var/qmail
 qmailrids=qmailr:qmail
+qmailinstall=false
 
 for arg ; do
   case "$arg" in
@@ -209,8 +211,10 @@ for arg ; do
     --disable-slashpackage) sproot= ; slashpackage=false ;;
     --enable-absolute-paths|--enable-absolute-paths=yes) abspath=true ;;
     --disable-absolute-paths|--enable-absolute-paths=no) abspath=false ;;
-    --with-qmail-home=*) qmailhome=${arg#*=} ;;
+    --qmaildir=*) qmailhome=${arg#*=} ;;
     --with-qmailr-ids=*) qmailrids=${arg#*=} ;;
+    --enable-qmail-install|--enable-qmail-install=yes) qmailinstall=true ;;
+    --disable-qmail-install|--enable-qmail-install=no) qmailinstall=false ;;
     --enable-*|--disable-*|--with-*|--without-*|--*dir=*) ;;
     --enable-*|--disable-*|--with-*|--without-*|--*dir=*) ;;
     --host=*|--target=*) target=${arg#*=} ;;
@@ -518,7 +522,11 @@ else
 fi
 echo "QMAIL_HOME := $qmailhome"
 echo "QMAILR_IDS := $qmailrids"
-
+if $qmailinstall ; then
+  echo 'INSTALL_QMAIL := 1'
+else
+  echo 'INSTALL_QMAIL :='
+fi
 exec 1>&3 3>&-
 echo "  ... done."