X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=configure.in;h=29c0bc96e90db928b8ae3f296e8b26b5713e671c;hb=156d35f6425bea4c1ed3c4c79783dc613379c65b;hp=e93e173c9a80ff2211ec6315244e503b20d44d9a;hpb=16fe088f7a4b204f3af67a1a378796b1bfe96694;p=mmh diff --git a/configure.in b/configure.in index e93e173..29c0bc9 100644 --- a/configure.in +++ b/configure.in @@ -5,7 +5,7 @@ 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) @@ -67,14 +67,6 @@ if test x"$enable_mhe" != x"no" -a x"$enable_nmh_mhe" != x"no"; then [Define to compile in support for the Emacs front-end mh-e.])dnl fi -dnl Do you want client-side support for pop? -AC_ARG_ENABLE(pop, - AS_HELP_STRING([--enable-pop], [enable client-side support for plain POP3])) -dnl The old redundant --enable-nmh-pop is deprecated and undocumented. -if test x"$enable_nmh_pop" = x"yes"; then - enable_pop=yes -fi - 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.]) @@ -86,22 +78,6 @@ fi], AC_DEFINE(LOCALE) ) -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, AS_HELP_STRING([--with-cyrus-sasl], - [Enable SASL support via the Cyrus SASL library])) -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 -fi - dnl Do you want client-side support for encryption with TLS? AC_ARG_WITH(tls, AS_HELP_STRING([--with-tls], [Enable TLS support])) if test x"$with_tls" != x -a x"$with_tls" != x"no"; then @@ -130,18 +106,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 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, - [Define this to compile client-side support for pop into inc and msgchk.])dnl - POPLIB=popsbr.o - POPSED='/^%nmhbeginpop%/d;/^%nmhendpop%/d' -else - POPSED='/^%nmhbeginpop%/,/^%nmhendpop%/d' -fi -AC_SUBST(POPLIB)dnl -AC_SUBST(POPSED)dnl - dnl What method of locking to use? AC_ARG_WITH(locking, AS_HELP_STRING([--with-locking=@<:@dot|fcntl|flock|lockf@:>@], @@ -164,24 +128,6 @@ else AC_DEFINE(DOT_LOCKING)dnl 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 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])) @@ -190,21 +136,11 @@ if test -n "$with_pager"; then pagerpath="$with_pager" fi -dnl What should be the default mail server(s)? -AC_ARG_WITH(smtpservers, - AS_HELP_STRING([--with-smtpservers='SMTPSERVER1@<:@ SMTPSERVER2...@:>@'], - [specify the default SMTP server(s) @<:@localhost@:>@])) -if test -n "$with_smtpservers"; then - smtpservers="$with_smtpservers" -else - smtpservers="localhost" -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 @@ -660,15 +596,6 @@ else fi -dnl -------------------- -dnl CHECK FOR CYRUS-SASL -dnl -------------------- - -AS_IF([test x"$sasl_support" = x"yes"],[ - AC_CHECK_HEADER([sasl/sasl.h], , [AC_MSG_ERROR([sasl.h not found])]) - AC_CHECK_LIB([sasl2], [sasl_client_new], , - [AC_MSG_ERROR([Cyrus SASL library not found])])]) - dnl ----------------- dnl CHECK FOR OPENSSL dnl ----------------- @@ -962,7 +889,6 @@ dnl ---------------- dnl OUTPUT MAKEFILES dnl ---------------- AC_CONFIG_FILES(Makefile config/Makefile h/Makefile sbr/Makefile uip/Makefile \ - mts/Makefile mts/smtp/Makefile \ etc/Makefile docs/Makefile man/Makefile) AC_CONFIG_COMMANDS([stamp],[test -z "$CONFIG_HEADERS" || echo > stamp-h]) AC_OUTPUT @@ -979,17 +905,6 @@ eval "nmhsysconf=${sysconfdir}"; eval "nmhsysconf=${nmhsysconf}" eval "nmhlib=${libdir}"; eval "nmhlib=${nmhlib}" eval "nmhman=${mandir}"; eval "nmhman=${nmhman}" -pop_kinds=no -if test x"$enable_pop" = x"yes"; then - pop_kinds="yes (" - - if test x"$enable_apop" = x"yes"; then - pop_kinds="${pop_kinds}APOP " - fi - - pop_kinds="${pop_kinds}POP3)" -fi - echo " nmh configuration ----------------- @@ -1005,13 +920,9 @@ library install path : ${nmhlib} config files install path : ${nmhsysconf} man page install path : ${nmhman} backup prefix : ${backup_prefix} -transport system : ${MTS} file locking type : ${LOCKTYPE} -default smtp servers : ${smtpservers} default editor : ${editorpath} default pager : ${pagerpath} email address masquerading : ${masquerade} -pop is enabled : ${pop_kinds} -SASL support : ${sasl_support} TLS support : ${tls_support}" echo ""