X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=configure.in;h=69728f8884aefc9fc6ef2c3ea36adcd1ad8a9b63;hb=80822fbdf1fc94c899b1f690df3f24f1e4df6c55;hp=a60920a21aa2aeec6e4e6b347b25b63dd6a52db2;hpb=7036a59145b61979bfd61344d55ac9ce36cc4d54;p=mmh

diff --git a/configure.in b/configure.in
index a60920a..69728f8 100644
--- a/configure.in
+++ b/configure.in
@@ -50,6 +50,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([backup-prefix],
+  [  --with-backup-prefix=,  set the backup prefix [,]])
+if test x"$with_backup_prefix" != x -a x"$with_backup_prefix" != x"no"; then
+  backup_prefix="$with_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,27 +129,30 @@ 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,
-[  --with-mts=MTS          specify the mail transport agent/service])
+[  --with-mts=MTS          specify the default mail transport agent/service])
 
 if test x"$with_mts" = x"smtp"; then
   MTS="smtp"
-  MTSLIB="mts/smtp/libsmtp.a"
-  AC_DEFINE(SMTPMTS)dnl
 elif test x"$with_mts" = x"sendmail"; then
   MTS="sendmail"
-  MTSLIB="mts/sendmail/libsend.a"
-  AC_DEFINE(SENDMTS)dnl
 else
   MTS="smtp"
-  MTSLIB="mts/smtp/libsmtp.a"
-  AC_DEFINE(SMTPMTS)dnl
 fi
-
 AC_SUBST(MTS)dnl
-AC_SUBST(MTSLIB)dnl
+
+dnl Both the smtp and sendmail mail transport services use the smtp code
+AC_DEFINE(SMTPMTS)dnl
 
 dnl What should be the default pager?
 undefine([pager])dnl
@@ -264,7 +278,9 @@ AC_CACHE_CHECK(whether tsort can deal with loops, nmh_cv_tsort_loop,
     nmh_cv_tsort_loop=yes
   fi])
 if test x$nmh_cv_tsort_loop = xno ; then
+  LORDER=echo
   TSORT=cat
+  AC_SUBST(LORDER)dnl
   AC_SUBST(TSORT)dnl
 fi
 
@@ -552,6 +568,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 ---------------------
@@ -784,12 +818,10 @@ libary install path        : ${nmhlib2}
 config files install path  : ${nmhsysconf2}
 man page install path      : ${nmhman}
 transport system           : ${MTS}
+backup prefix              : ${backup_prefix}
 default smtp servers       : ${smtpservers}
 default editor             : ${editorpath}
 default pager              : ${pagerpath}
 email address masquerading : ${masquerade}
 pop is enabled             : ${pop_kinds}"
 echo ""
-
-
-