X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=configure.ac;h=fd9b98e3b56bcebe6bd2d6e101be1e2b200fa447;hb=5e000509849ff401de669b282057511d4d933b7b;hp=a6b5525b012854a5185879009529c93d4d4dd25e;hpb=00949f4fa56dc4e1a7d4ea1972d7492d80880b2c;p=mmh

diff --git a/configure.ac b/configure.ac
index a6b5525..fd9b98e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,16 +30,6 @@ AC_ARG_ENABLE([debug],
 dnl The old redundant --enable-nmh-debug is deprecated and undocumented.
 AS_IF([test x"$enable_nmh_debug" = x"yes"], [enable_debug=yes])
 
-dnl Allow users to send email from addresses other than their default?
-AC_ARG_ENABLE(masquerade,
-  AS_HELP_STRING([--enable-masquerade='draft_from mmailid username_extension'],
-    [enable up to 3 types of address masquerading]),
-  [AS_IF([test x"$enable_masquerade" = x"yes"],
-	 [masquerade="draft_from mmailid username_extension"],
-	 [masquerade="$enable_masquerade"])],
-  [masquerade="draft_from mmailid username_extension"])
-AC_SUBST(masquerade)dnl
-
 dnl Do you want to disable use of locale functions
 AH_TEMPLATE([LOCALE],
 [Undefine if you don't want locale features.  By default this is defined.])
@@ -123,10 +113,6 @@ AS_IF([test x"$with_mts" = x"smtp"], [MTS="smtp"],
       [MTS="smtp"])
 AC_SUBST([MTS])dnl
 
-dnl Both the smtp and sendmail mail transport services use the smtp code
-AC_DEFINE([SMTPMTS], [1],
-  [Define if you want SMTP (simple mail transport protocol) support.])dnl
-
 dnl What should be the default pager?
 AC_ARG_WITH([pager],
   AS_HELP_STRING([--with-pager=PAGER],[specify the default pager]))
@@ -247,7 +233,17 @@ AC_PROG_LEX             dnl Check for lex/flex
 
 dnl Look for `cut'
 pathtmp=/usr/bin:/bin:/usr/local/bin:/usr/xpg4/bin:/usr/ucb
-AC_PATH_PROG(cutpath, cut, no, [$pathtmp])
+AC_PATH_PROG([cutpath], [cut], [no], [$pathtmp])
+
+dnl
+dnl Check for MD5 program and formatting command
+dnl
+AC_CHECK_PROGS([MD5SUM], [md5sum md5], [missing])
+AS_CASE(["${MD5SUM}"],
+	[md5sum], [MD5FMT="cat"],
+	[md5], [[MD5FMT="${SED} -e 's/MD5 *(\(.*\)) *= \([0-9a-f]*\)/\2  \1/'"]],
+	[MD5FMT="missing"])
+AC_SUBST([MD5FMT])
 
 dnl ----------------------------------------------
 dnl check for lclint, and lint if it doesn't exist
@@ -752,7 +748,6 @@ file locking type          : ${LOCKTYPE}
 default smtp servers       : ${smtpservers}
 default editor             : ${editorpath}
 default pager              : ${pagerpath}
-email address masquerading : ${masquerade}
 SASL support               : ${sasl_support}
 TLS support                : ${tls_support}
 ])])dnl
@@ -760,5 +755,5 @@ TLS support                : ${tls_support}
 dnl ---------------
 dnl OUTPUT MAKEFILE
 dnl ---------------
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile test/common.sh])
 AC_OUTPUT