X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=configure.in;h=d80a2d2e538399ec96308a629690d653900b621a;hb=d3df81fcf2e52e4e484da1c1df431c7a915a3139;hp=a3d338657b544d9ef41ac281cc1f21303f2f0027;hpb=df7b16cb148474b3b80dbf1e226e858cf1e47edb;p=mmh

diff --git a/configure.in b/configure.in
index a3d3386..d80a2d2 100644
--- a/configure.in
+++ b/configure.in
@@ -14,11 +14,13 @@ dnl define a macro or two
 dnl ---------------------
 
 AC_DEFUN(NMH_PROG_GNU_LIBTOOL, [
+if test -n "$LIBTOOL" ; then
   tmptest=`$LIBTOOL --version 2>&1 | grep GNU`
   if test x"$tmptest" != x  ; then
     GNU_LIBTOOL=1
     AC_SUBST(GNU_LIBTOOL)dnl
   fi
+fi
 ] )
   
 
@@ -50,6 +52,17 @@ if test x"$enable_nmh_debug" = x"yes"; then
   enable_debug=yes
 fi
 
+dnl Set the backup prefix
+undefine([backup-prefix])dnl
+AC_ARG_WITH([hash-backup],
+  [  --with-hash-backup      use # as the backup prefix (default: ,)])
+if test x"$with_hash_backup" != x -a x"$with_hash_backup" != x"no"; then
+  backup_prefix="#"
+else
+  backup_prefix=","
+fi
+AC_DEFINE_UNQUOTED(BACKUP_PREFIX, "$backup_prefix")dnl
+
 dnl Allow users to send email from addresses other than their default?
 undefine([masquerade])dnl
 AC_ARG_ENABLE(masquerade,
@@ -118,6 +131,14 @@ if test -n "$with_editor"; then
   editorpath="$with_editor"
 fi
 
+dnl Do you want client-side support for using SASL for authentication?
+dnl Note that this code will be enabled for both POP and SMTP
+AC_ARG_WITH(cyrus-sasl,
+[  --with-cyrus-sasl=<dir> Specify location of Cyrus SASL library for auth])
+if test x"$with_cyrus_sasl" != x -a x"$with_cyrus_sasl" != "no"; then
+  AC_DEFINE(CYRUS_SASL)dnl
+fi
+
 dnl What method of posting should post use?
 undefine([mts])dnl
 AC_ARG_WITH(mts,
@@ -549,6 +570,24 @@ fi
 AC_SUBST(KRB4_INCLUDES)dnl
 AC_SUBST(KRB4_LIBS)dnl
 
+dnl --------------------
+dnl CHECK FOR CYRUS SASL
+dnl --------------------
+if test x"$with_cyrus_sasl" != x -a x"$with_cyrus_sasl" != "no"; then
+  if test x"$with_cyrus_sasl" != x"yes"; then
+    SASL_INCLUDES="-I$with_cyrus_sasl/include"
+    SASL_LIBS="-L$with_cyrus_sasl/lib"
+  fi
+  save_LDFLAGS="$LDFLAGS"
+  LDFLAGS="$LDFLAGS $SASL_LIBS"
+  AC_CHECK_LIB(sasl, sasl_client_new,
+    [SASL_LIBS="$SASL_LIBS -lsasl"],
+    [AC_MSG_ERROR(Cyrus SASL library not found)])
+  LDFLAGS="$save_LDFLAGS"
+fi
+AC_SUBST(SASL_INCLUDES)dnl
+AC_SUBST(SASL_LIBS)dnl
+
 dnl ---------------------
 dnl CHECK TERMCAP LIBRARY
 dnl ---------------------
@@ -780,6 +819,7 @@ binary install path        : ${nmhbin2}
 libary install path        : ${nmhlib2}
 config files install path  : ${nmhsysconf2}
 man page install path      : ${nmhman}
+backup prefix              : ${backup_prefix}
 transport system           : ${MTS}
 default smtp servers       : ${smtpservers}
 default editor             : ${editorpath}
@@ -787,6 +827,3 @@ default pager              : ${pagerpath}
 email address masquerading : ${masquerade}
 pop is enabled             : ${pop_kinds}"
 echo ""
-
-
-