X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=configure.ac;h=a6a55efbb7c54d5c0610f7ad52f45579a0361ee2;hb=6a7760a0fa8ccb36a056a7600aab31f3656f7cfa;hp=6a37f2fc6466bf677f0c16dc8d8a1a1b03810645;hpb=b067ff5c465a5d243ce5a19e562085a9a1a97215;p=mmh

diff --git a/configure.ac b/configure.ac
index 6a37f2f..a6a55ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl
-dnl configure.ac -- autoconf template for nmh
+dnl configure.ac -- autoconf template for mmh
 dnl
 
 dnl Move this up a bit
@@ -28,16 +28,16 @@ fi
 echo "configuring for AC_PACKAGE_NAME-AC_PACKAGE_VERSION"
 AC_SUBST(VERSION,AC_PACKAGE_VERSION)dnl
 
-dnl What date of nmh are we building?
+dnl What date of mmh are we building?
 DATE=`cat ${srcdir}/DATE`
-echo "configuring for nmh dated $DATE"
+echo "configuring for mmh dated $DATE"
 AC_SUBST(DATE)dnl
 
 dnl --------------------------
 dnl CHECK COMMAND LINE OPTIONS
 dnl --------------------------
 
-dnl Do you want to debug nmh?
+dnl Do you want to debug mmh?
 AC_ARG_ENABLE(debug,
   AS_HELP_STRING([--enable-debug],[enable nmh code debugging]))
 dnl The old redundant --enable-nmh-debug is deprecated and undocumented.
@@ -45,17 +45,6 @@ if test x"$enable_nmh_debug" = x"yes"; then
   enable_debug=yes
 fi
 
-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]),
-  [if test x"$enable_masquerade" = x"yes"; then
-    masquerade="draft_from mmailid username_extension"
-  else
-    masquerade="$enable_masquerade"
-  fi], [masquerade="draft_from mmailid username_extension"])
-AC_SUBST(masquerade)dnl
-
 dnl Do you want mhe support?
 AC_ARG_ENABLE(mhe,
   AS_HELP_STRING([--disable-mhe],[disable mhe support]))
@@ -100,13 +89,6 @@ else
   AC_DEFINE(DOT_LOCKING)dnl
 fi
 
-dnl What should be the default pager?
-AC_ARG_WITH(pager,
-  AS_HELP_STRING([--with-pager=PAGER],[specify the default pager]))
-
-if test -n "$with_pager"; then
-  pagerpath="$with_pager"
-fi
 
 dnl ----------------------------------------------------
 dnl Default location is /usr/local/mmh/{bin,etc,lib,share/man}
@@ -385,7 +367,7 @@ dnl ---------------
 AC_FUNC_VFORK
 AC_CHECK_LIB(mkstemp,mkstemp)
 AC_CHECK_FUNCS(waitpid wait3 sigaction sigprocmask sigblock sigsetmask \
-               sighold sigrelse writev lstat uname tzset killpg mkstemp \
+               sighold sigrelse lstat uname tzset killpg mkstemp \
                getutent nl_langinfo mbtowc wcwidth)
 
 dnl sigsetjmp may be a macro
@@ -602,7 +584,7 @@ main()
 {
 	char buf[4096];
 	int r1 = tgetent(buf, "vt100");
-	int r2 = tgetent((char*)0,"vt100");
+	int r2 = tgetent(NULL,"vt100");
 	if (r1 >= 0 && r1 == r2) {
 		char tbuf[1024], *u;
 		u = tbuf;
@@ -825,9 +807,9 @@ eval "nmhlib=${libdir}";         eval "nmhlib=${nmhlib}"
 eval "nmhman=${mandir}";         eval "nmhman=${nmhman}"
 
 echo "
-nmh configuration
+mmh configuration
 -----------------
-nmh version            : AC_PACKAGE_VERSION
+mmh version            : AC_PACKAGE_VERSION
 target os              : ${target}
 compiler               : ${CC}
 compiler flags         : ${CFLAGS}
@@ -841,7 +823,7 @@ config install path    : ${nmhsysconf}
 man page install path  : ${nmhman}
 
 sendmail path          : ${sendmailpath}
+mail spool             : ${mailspool}
 
 file locking type      : ${LOCKTYPE}
-address masquerading   : ${masquerade}
 "