Resolve the circular dependency of libmh on libmts on libmh. The

[mmh] / configure.in

diff --git a/configure.in b/configure.in
index 6d57642..8c43c76 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -14,11 +14,13 @@ dnl define a macro or two
 dnl ---------------------
 
 AC_DEFUN(NMH_PROG_GNU_LIBTOOL, [
+if test -n "$LIBTOOL" ; then
   tmptest=`$LIBTOOL --version 2>&1 | grep GNU`
   if test x"$tmptest" != x  ; then
     GNU_LIBTOOL=1
     AC_SUBST(GNU_LIBTOOL)dnl
   fi
+fi
 ] )
   
 
@@ -82,6 +84,34 @@ if test x"$enable_nmh_pop" = x"yes"; then
   enable_pop=yes
 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 should be the default editor?
+undefine([editor])dnl
+AC_ARG_WITH(editor,
+[  --with-editor=EDITOR    specify the default editor])
+
+if test -n "$with_editor"; then
+  editorpath="$with_editor"
+fi
+
+dnl Set the backup prefix
+undefine([backup-prefix])dnl
+AC_ARG_WITH([hash-backup],
+  [  --with-hash-backup      use # as the backup prefix (default: ,)])
+if test x"$with_hash_backup" != x -a x"$with_hash_backup" != x"no"; then
+  backup_prefix="#"
+else
+  backup_prefix=","
+fi
+AC_DEFINE_UNQUOTED(BACKUP_PREFIX, "$backup_prefix")dnl
+
 dnl Do you want support for hesiod
 AC_ARG_WITH(hesiod,
 [  --with-hesiod=PREFIX    specify location of Hesiod])
@@ -109,23 +139,6 @@ fi
 AC_SUBST(POPLIB)dnl
 AC_SUBST(POPSED)dnl
 
-dnl What should be the default editor?
-undefine([editor])dnl
-AC_ARG_WITH(editor,
-[  --with-editor=EDITOR    specify the default editor])
-
-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,
@@ -234,8 +247,8 @@ else
     LINTFLAGS=""
   fi
 fi
-AC_SUBST(LINT)
-AC_SUBST(LINTFLAGS)
+AC_SUBST(LINT)dnl
+AC_SUBST(LINTFLAGS)dnl
 
 dnl try to figure out which one we've got
 AC_CHECK_PROG(LIBTOOL, libtool, libtool, , [$pathtmp])
@@ -434,7 +447,7 @@ if test $nmh_cv_header_termios_h_tiocgwinsz = no; then
   nmh_cv_header_sys_ioctl_h_tiocgwinsz=yes,
   nmh_cv_header_sys_ioctl_h_tiocgwinsz=no)])
   if test $nmh_cv_header_sys_ioctl_h_tiocgwinsz = yes; then
-    AC_DEFINE(GWINSZ_IN_SYS_IOCTL)
+    AC_DEFINE(GWINSZ_IN_SYS_IOCTL)dnl
   fi
 fi
  
@@ -607,7 +620,7 @@ if test $nmh_cv_decl_ospeed_include_defines = no; then
 fi
  
 if test $nmh_cv_decl_ospeed_include_defines = yes; then
-  AC_DEFINE(HAVE_OSPEED)
+  AC_DEFINE(HAVE_OSPEED)dnl
 elif test $nmh_cv_decl_ospeed_must_define = yes; then
   AC_DEFINE(HAVE_OSPEED)
   AC_DEFINE(MUST_DEFINE_OSPEED)
@@ -766,10 +779,8 @@ dnl ----------------
 dnl OUTPUT MAKEFILES
 dnl ----------------
 AC_OUTPUT(Makefile config/Makefile h/Makefile sbr/Makefile uip/Makefile \
-          zotnet/Makefile zotnet/mts/Makefile \
           mts/Makefile mts/smtp/Makefile \
-         mts/sendmail/Makefile mts/mmdf/Makefile etc/Makefile \
-         docs/Makefile man/Makefile, \
+         etc/Makefile docs/Makefile man/Makefile, \
           [test -z "$CONFIG_HEADERS" || echo > stamp-h])
 
 dnl Umm, what's the point of these assignments??  -- <dan-nmh@dilvish.speed.net>
@@ -806,6 +817,7 @@ binary install path        : ${nmhbin2}
 libary install path        : ${nmhlib2}
 config files install path  : ${nmhsysconf2}
 man page install path      : ${nmhman}
+backup prefix              : ${backup_prefix}
 transport system           : ${MTS}
 default smtp servers       : ${smtpservers}
 default editor             : ${editorpath}
@@ -813,6 +825,3 @@ default pager              : ${pagerpath}
 email address masquerading : ${masquerade}
 pop is enabled             : ${pop_kinds}"
 echo ""
-
-
-