Alphabetized Shantonu's $pop_kinds output on configure's "pop is enabled" line.

If POP3 is the only kind of POP enabled, say so, rather than just saying "yes"
(which is ambiguous).

diff --git a/ChangeLog b/ChangeLog
index 1fdd6f8..401456f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue May 09 00:11:55 2000 Dan Harkless <dan-nmh@dilvish.speed.net>
+
+       * Alphabetized Shantonu's $pop_kinds output on configure's "pop is
+       enabled" line.  If POP3 is the only kind of POP enabled, say so,
+       rather than just saying "yes" (which is ambiguous).
+       

 Mon May 08 23:51:55 2000 Dan Harkless <dan-nmh@dilvish.speed.net>
 
        * Doug informed me that the way I had restored the "lost" version
 Mon May 08 23:51:55 2000 Dan Harkless <dan-nmh@dilvish.speed.net>
 
        * Doug informed me that the way I had restored the "lost" version

diff --git a/configure b/configure
index 7666c28..ea95842 100755 (executable)
--- a/configure
+++ b/configure
@@ -4788,20 +4788,19 @@ eval "nmhsysconf=${sysconfdir}"; eval "nmhsysconf2=${nmhsysconf}"
 eval "nmhlib=${libdir}";         eval "nmhlib2=${nmhlib}"
 eval "nmhman=${mandir}"
 
 eval "nmhlib=${libdir}";         eval "nmhlib2=${nmhlib}"
 eval "nmhman=${mandir}"
 

-pop_kinds="no"
+pop_kinds=no

 if test x"$enable_pop" = x"yes"; then
 if test x"$enable_pop" = x"yes"; then

-        pop_kinds="yes (pop"
-        if test x"$enable_apop" = x"yes"; then
-                pop_kinds="${pop_kinds} apop"
-        fi
-       if test x"$with_krb4" != x -a x"$with_krb4" != x"no"; then
-                pop_kinds="${pop_kinds} kpop"
-        fi
-        if test "$pop_kinds" = "yes (pop"; then
-                pop_kinds="yes"
-        else
-                pop_kinds="${pop_kinds})"
-        fi
+  pop_kinds="yes ("
+
+  if test x"$enable_apop" = x"yes"; then
+    pop_kinds="${pop_kinds}APOP "
+  fi
+
+  if test x"$with_krb4" != x -a x"$with_krb4" != x"no"; then
+    pop_kinds="${pop_kinds}KPOP "
+  fi
+
+  pop_kinds="${pop_kinds}POP3)"

 fi
 
 echo "
 fi
 
 echo "

diff --git a/configure.in b/configure.in
index 3d204fb..957b3da 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -708,20 +708,19 @@ eval "nmhsysconf=${sysconfdir}"; eval "nmhsysconf2=${nmhsysconf}"
 eval "nmhlib=${libdir}";         eval "nmhlib2=${nmhlib}"
 eval "nmhman=${mandir}"
 
 eval "nmhlib=${libdir}";         eval "nmhlib2=${nmhlib}"
 eval "nmhman=${mandir}"
 

-pop_kinds="no"
+pop_kinds=no

 if test x"$enable_pop" = x"yes"; then
 if test x"$enable_pop" = x"yes"; then

-        pop_kinds="yes (pop"
-        if test x"$enable_apop" = x"yes"; then
-                pop_kinds="${pop_kinds} apop"
-        fi
-       if test x"$with_krb4" != x -a x"$with_krb4" != x"no"; then
-                pop_kinds="${pop_kinds} kpop"
-        fi
-        if test "$pop_kinds" = "yes (pop"; then
-                pop_kinds="yes"
-        else
-                pop_kinds="${pop_kinds})"
-        fi
+  pop_kinds="yes ("
+
+  if test x"$enable_apop" = x"yes"; then
+    pop_kinds="${pop_kinds}APOP "
+  fi
+
+  if test x"$with_krb4" != x -a x"$with_krb4" != x"no"; then
+    pop_kinds="${pop_kinds}KPOP "
+  fi
+
+  pop_kinds="${pop_kinds}POP3)"

 fi
 
 echo "
 fi
 
 echo "