X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=configure.in;h=44f07b3d51a456f0a22c9a6d1626b196658f66ba;hp=8e8fb1c956a0c3fc4946d220257ebd02d9369b9b;hb=05b7f957ba42e79f49b3a62aea2502168c9abf7a;hpb=e056446589e2fee53f823e0da1fb34076018c3dd

diff --git a/configure.in b/configure.in
index 8e8fb1c..44f07b3 100644
--- a/configure.in
+++ b/configure.in
@@ -1,13 +1,11 @@
 dnl
 dnl configure.in -- autoconf template for nmh
 dnl
-dnl $Id$
-dnl
 
 dnl Move this up a bit
 AC_PREREQ(2.61)
 
-AC_INIT(nmh, m4_normalize(m4_include([VERSION])))
+AC_INIT(mmh, m4_normalize(m4_include([VERSION])))
 AC_CONFIG_SRCDIR(h/nmh.h)
 AC_CONFIG_HEADER(config.h)
 
@@ -39,17 +37,6 @@ dnl --------------------------
 dnl CHECK COMMAND LINE OPTIONS
 dnl --------------------------
 
-dnl Do you want client-side support for apop?
-AC_ARG_ENABLE(apop, AS_HELP_STRING([--enable-apop],
-  [enable client-side support for POP3 and APOP]))
-if test x"$enable_apop" = x"yes"; then
-  AC_DEFINE(APOP, 1,
-    [Define to compile client-side support for apop into inc and msgchk.])dnl
-  APOPLIB=md5.o
-  enable_pop=yes
-fi
-AC_SUBST(APOPLIB)dnl
-
 dnl Do you want to debug nmh?
 AC_ARG_ENABLE(debug,
   AS_HELP_STRING([--enable-debug],[enable nmh code debugging]))
@@ -66,8 +53,7 @@ AC_ARG_ENABLE(masquerade,
     masquerade="draft_from mmailid username_extension"
   else
     masquerade="$enable_masquerade"
-  fi],
-  masquerade="draft_from mmailid username_extension")
+  fi], [masquerade="draft_from mmailid username_extension"])
 AC_SUBST(masquerade)dnl
 
 dnl Do you want mhe support?
@@ -107,6 +93,10 @@ AC_ARG_WITH(cyrus-sasl, AS_HELP_STRING([--with-cyrus-sasl],
 if test x"$with_cyrus_sasl" != x -a x"$with_cyrus_sasl" != x"no"; then
   AC_DEFINE(CYRUS_SASL, 1,
     [Define to use the Cyrus SASL library for authentication of POP and SMTP.])dnl
+  if test x"$with_cyrus_sasl" != xyes; then
+    AC_MSG_WARN([Arguments to --with-cyrus-sasl now ignored])
+    AC_MSG_WARN([Please pass the appropriate arguments to CPPFLAGS/LDFLAGS])
+  fi
   sasl_support=yes
 else
   sasl_support=no
@@ -140,13 +130,6 @@ fi
 AC_DEFINE_UNQUOTED(BACKUP_PREFIX, "$backup_prefix",
     [The prefix that is prepended to the name of message files when they are "removed" by rmm. This should typically be `,' or `#'.])dnl
 
-dnl Do you want support for hesiod
-AC_ARG_WITH(hesiod,
-  AS_HELP_STRING([--with-hesiod=DIR],[specify location of Hesiod]))
-if test x"$with_hesiod" != x -a x"$with_hesiod" != x"no"; then
-  AC_DEFINE(HESIOD,1,[Define this to compile support for using Hesiod.])dnl
-fi
-
 dnl After we know if we're including apop and kpop support, do pop stuff
 if test x"$enable_pop" = x"yes"; then
   AC_DEFINE(POP, 1,
@@ -182,18 +165,9 @@ else
 fi
 
 dnl What method of posting should post use?
-AC_ARG_WITH(mts,
-  AS_HELP_STRING([--with-mts=@<:@smtp|sendmail@:>@],
-  [specify the default mail transport agent/service]))
-
-if test x"$with_mts" = x"smtp"; then
-  MTS="smtp"
-elif test x"$with_mts" = x"sendmail"; then
-  MTS="sendmail"
-else
-  MTS="smtp"
-fi
-AC_SUBST(MTS)dnl
+dnl We'll always use sendmail now. (mmh)
+MTS="sendmail"
+dnl #AC_SUBST(MTS)dnl
 
 dnl Both the smtp and sendmail mail transport services use the smtp code
 AC_DEFINE(SMTPMTS, 1,
@@ -219,9 +193,10 @@ fi
 AC_SUBST(smtpservers)dnl
 
 dnl ----------------------------------------------------
-dnl Default location is /usr/local/nmh/{bin,etc,lib,man}
+dnl Default location is /usr/local/mmh/{bin,etc,lib,share/man}
 dnl ----------------------------------------------------
-AC_PREFIX_DEFAULT(/usr/local/nmh)
+AC_PREFIX_DEFAULT(/usr/local/mmh)
+
 
 dnl ------------------
 dnl CHECK THE COMPILER
@@ -677,28 +652,6 @@ else
 fi
 
 
-dnl ----------------
-dnl CHECK FOR HESIOD
-dnl ----------------
-if test x"$with_hesiod" != x -a x"$with_hesiod" != x"no"; then
-  if test x"$with_hesiod" != x"yes"; then
-    HESIOD_INCLUDES="-I$with_hesiod/include"
-    HESIOD_LIBS="-L$with_hesiod/lib"
-  fi
-  AC_CHECK_FUNC(res_send,
-	[AC_CHECK_LIB(hesiod, hes_resolve,
-		[HESIOD_LIBS="$HESIOD_LIBS -lhesiod"],
-		[AC_MSG_ERROR(Hesiod library not found)],
-		$HESIOD_LIBS)],
-	[AC_CHECK_LIB(hesiod, hes_resolve,
-		[HESIOD_LIBS="$HESIOD_LIBS -lhesiod -lresolv"],
-		[AC_MSG_ERROR(Hesiod library not found)],
-		$HESIOD_LIBS -lresolv)])
-
-fi
-AC_SUBST(HESIOD_INCLUDES)dnl
-AC_SUBST(HESIOD_LIBS)dnl
-
 dnl --------------------
 dnl CHECK FOR CYRUS-SASL
 dnl --------------------