From 1a6d560c7caf83a0419cd0f5c7337db2c672da0a Mon Sep 17 00:00:00 2001 From: Dan Harkless Date: Fri, 21 Jul 2000 01:43:58 +0000 Subject: [PATCH] People did not preserve my alphabetization of the --with options when they added new ones. Re-alphabetized. --- ChangeLog | 6 ++++-- configure | 54 +++++++++++++++++++++++++++--------------------------- configure.in | 34 +++++++++++++++++----------------- stamp-h.in | 2 +- 4 files changed, 49 insertions(+), 47 deletions(-) diff --git a/ChangeLog b/ChangeLog index ead1a4a..9850614 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,9 @@ -Mon Jul 17 13:11:52 2000 Dan Harkless +Mon Jul 17 13:53:26 2000 Dan Harkless * Moved Kimmo's new "--with-hash-backup" to be output with the - rest of the --with options in the configure --help output. + rest of the --with options in the configure --help output. Also, + people did not preserve my alphabetization of the --with options + when they added new ones. Re-alphabetized. * One more pass at README.developers now that it's clear that my previously-suggested one-line autoconf-file commit can cause diff --git a/configure b/configure index 4eb5951..c8ebc1c 100755 --- a/configure +++ b/configure @@ -23,16 +23,16 @@ ac_help="$ac_help ac_help="$ac_help --enable-pop enable client-side support for plain POP3" ac_help="$ac_help + --with-cyrus-sasl= Specify location of Cyrus SASL library for auth" +ac_help="$ac_help + --with-editor=EDITOR specify the default editor" +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" ac_help="$ac_help - --with-editor=EDITOR specify the default editor" -ac_help="$ac_help - --with-cyrus-sasl= Specify location of Cyrus SASL library for auth" -ac_help="$ac_help --with-mts=MTS specify the default mail transport agent/service" ac_help="$ac_help --with-pager=PAGER specify the default pager" @@ -727,6 +727,29 @@ if test x"$enable_nmh_pop" = x"yes"; then enable_pop=yes fi +# Check whether --with-cyrus-sasl or --without-cyrus-sasl was given. +if test "${with_cyrus_sasl+set}" = set; then + withval="$with_cyrus_sasl" + : +fi + +if test x"$with_cyrus_sasl" != x -a x"$with_cyrus_sasl" != "no"; then + cat >> confdefs.h <<\EOF +#define CYRUS_SASL 1 +EOF +fi + +# Check whether --with-editor or --without-editor was given. +if test "${with_editor+set}" = set; then + withval="$with_editor" + : +fi + + +if test -n "$with_editor"; then + editorpath="$with_editor" +fi + # Check whether --with-hash-backup or --without-hash-backup was given. if test "${with_hash_backup+set}" = set; then withval="$with_hash_backup" @@ -780,29 +803,6 @@ else POPSED='/^%nmhbeginpop%/,/^%nmhendpop%/d' fi -# Check whether --with-editor or --without-editor was given. -if test "${with_editor+set}" = set; then - withval="$with_editor" - : -fi - - -if test -n "$with_editor"; then - editorpath="$with_editor" -fi - -# Check whether --with-cyrus-sasl or --without-cyrus-sasl was given. -if test "${with_cyrus_sasl+set}" = set; then - withval="$with_cyrus_sasl" - : -fi - -if test x"$with_cyrus_sasl" != x -a x"$with_cyrus_sasl" != "no"; then - cat >> confdefs.h <<\EOF -#define CYRUS_SASL 1 -EOF -fi - # Check whether --with-mts or --without-mts was given. if test "${with_mts+set}" = set; then withval="$with_mts" diff --git a/configure.in b/configure.in index 76e920f..9b76ddf 100644 --- a/configure.in +++ b/configure.in @@ -84,6 +84,23 @@ 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= 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], @@ -122,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= 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, diff --git a/stamp-h.in b/stamp-h.in index 93863e8..300d02b 100644 --- a/stamp-h.in +++ b/stamp-h.in @@ -1 +1 @@ -Thu Jul 20 13:02:27 PDT 2000 +Thu Jul 20 18:40:01 PDT 2000 -- 1.7.10.4