From c4dffde1321c04eddde696b28c05c4c68d85a617 Mon Sep 17 00:00:00 2001
From: Dan Harkless <dan@harkless.org>
Date: Thu, 20 Jul 2000 20:14:39 +0000
Subject: [PATCH] Moved Kimmo's new "--with-hash-backup" to be output with the
 rest of the --with options in the configure --help output,
 rather than being in between two random --enable options.

---
 ChangeLog    |    5 +++++
 configure    |   34 +++++++++++++++++-----------------
 configure.in |   22 +++++++++++-----------
 stamp-h.in   |    2 +-
 4 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index efc679d..f4e32df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jul 17 13:11:52 2000 Dan Harkless <dan-nmh@dilvish.speed.net>
+
+	* Moved Kimmo's new "--with-hash-backup" to be output with the
+ 	rest of the --with options in the configure --help output.
+
 Tue Jul 18 19:36:59 EDT 2000 Kimmo Suominen <kim@tac.nyc.ny.us>
 
 	* Added the obvious answer to Dan's question in README.developers;
diff --git a/configure b/configure
index 520d155..4eb5951 100755
--- a/configure
+++ b/configure
@@ -16,8 +16,6 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-debug          enable nmh code debugging"
 ac_help="$ac_help
-  --with-hash-backup      use # as the backup prefix (default: ,)"
-ac_help="$ac_help
   --enable-masquerade[='draft_from mmailid username_extension']
                           enable up to 3 types of address masquerading [none]"
 ac_help="$ac_help
@@ -25,6 +23,8 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-pop            enable client-side support for plain POP3"
 ac_help="$ac_help
+  --with-hash-backup      use # as the backup prefix (default: ,)"
+ac_help="$ac_help
   --with-hesiod=PREFIX    specify location of Hesiod"
 ac_help="$ac_help
   --with-krb4=PREFIX      specify location of Kerberos V4 for KPOP support"
@@ -693,21 +693,6 @@ if test x"$enable_nmh_debug" = x"yes"; then
   enable_debug=yes
 fi
 
-# Check whether --with-hash-backup or --without-hash-backup was given.
-if test "${with_hash_backup+set}" = set; then
-  withval="$with_hash_backup"
-  :
-fi
-
-if test x"$with_hash_backup" != x -a x"$with_hash_backup" != x"no"; then
-  backup_prefix="#"
-else
-  backup_prefix=","
-fi
-cat >> confdefs.h <<EOF
-#define BACKUP_PREFIX "$backup_prefix"
-EOF
-
 # Check whether --enable-masquerade or --disable-masquerade was given.
 if test "${enable_masquerade+set}" = set; then
   enableval="$enable_masquerade"
@@ -742,6 +727,21 @@ if test x"$enable_nmh_pop" = x"yes"; then
   enable_pop=yes
 fi
 
+# Check whether --with-hash-backup or --without-hash-backup was given.
+if test "${with_hash_backup+set}" = set; then
+  withval="$with_hash_backup"
+  :
+fi
+
+if test x"$with_hash_backup" != x -a x"$with_hash_backup" != x"no"; then
+  backup_prefix="#"
+else
+  backup_prefix=","
+fi
+cat >> confdefs.h <<EOF
+#define BACKUP_PREFIX "$backup_prefix"
+EOF
+
 # Check whether --with-hesiod or --without-hesiod was given.
 if test "${with_hesiod+set}" = set; then
   withval="$with_hesiod"
diff --git a/configure.in b/configure.in
index d80a2d2..76e920f 100644
--- a/configure.in
+++ b/configure.in
@@ -52,17 +52,6 @@ if test x"$enable_nmh_debug" = x"yes"; then
   enable_debug=yes
 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 Allow users to send email from addresses other than their default?
 undefine([masquerade])dnl
 AC_ARG_ENABLE(masquerade,
@@ -95,6 +84,17 @@ if test x"$enable_nmh_pop" = x"yes"; then
   enable_pop=yes
 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])
diff --git a/stamp-h.in b/stamp-h.in
index 281f6ef..93863e8 100644
--- a/stamp-h.in
+++ b/stamp-h.in
@@ -1 +1 @@
-Sun Jul 16 02:02:08 EDT 2000
+Thu Jul 20 13:02:27 PDT 2000
-- 
1.7.10.4