From a2622ee1cc6975765be76ee618f5ebb711c1e878 Mon Sep 17 00:00:00 2001
From: okuji <okuji@localhost>
Date: Tue, 17 Oct 2000 14:39:15 +0000
Subject: [PATCH] --disable-md5password -> --disable-md5-password

---
 ChangeLog    |  5 +++++
 config.h.in  | 50 +++++++++++++++++++++-----------------------------
 configure    | 12 ++++++------
 configure.in |  6 +++---
 4 files changed, 35 insertions(+), 38 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6d80f71cc..a2e8dea10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-17  OKUJI Yoshinori  <okuji@gnu.org>
+
+	* configure.in (--disable-md5password): Renamed to ...
+	(--disable-md5-password): ... this. Just for my preference.
+	
 2000-10-17  Jochen Hoenicke  <jochen@gnu.org>
 
 	Added MD5 passwords and extended password command:
diff --git a/config.h.in b/config.h.in
index d04a7eb0a..56db8bd27 100644
--- a/config.h.in
+++ b/config.h.in
@@ -27,44 +27,36 @@
 /* Defined if an absolute indirect call/jump must NOT be prefixed with `*'.  */
 #undef ABSOLUTE_WITHOUT_ASTERISK
 
-/* Define it to "addr32" or "addr32;" to make GAS happy */
-#undef ADDR32
-
-/* Define it to "data32" or "data32;" to make GAS happy */
-#undef DATA32
-
-/* Define if C symbols get an underscore after compilation */
-#undef HAVE_ASM_USCORE
-
-/* Define if you have the <curses.h> header file. */
+/* Define if you have the <curses.h> header file.  */
 #undef HAVE_CURSES_H
 
-/* Define if you have the `curses' library (-lcurses). */
-#undef HAVE_LIBCURSES
-
-/* Define if you have the `ncurses' library (-lncurses). */
-#undef HAVE_LIBNCURSES
-
-/* Define if you have the `util' library (-lutil). */
-#undef HAVE_LIBUTIL
-
-/* Define if you have the <ncurses/curses.h> header file. */
-#undef HAVE_NCURSES_CURSES_H
-
-/* Define if you have the <ncurses.h> header file. */
+/* Define if you have the <ncurses.h> header file.  */
 #undef HAVE_NCURSES_H
 
-/* Define if opendisk() in -lutil can be used */
-#undef HAVE_OPENDISK
+/* Define if you have the <ncurses/curses.h> header file.  */
+#undef HAVE_NCURSES_CURSES_H
 
-/* Define if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define if you have the <string.h> header file. */
+/* Define if you have the <string.h> header file.  */
 #undef HAVE_STRING_H
 
+/* Define if you have the <strings.h> header file.  */
+#undef HAVE_STRINGS_H
+
 /* Name of package */
 #undef PACKAGE
 
 /* Version number of package */
 #undef VERSION
+
+/* Define if C symbols get an underscore after compilation */
+#undef HAVE_ASM_USCORE
+
+/* Define it to "addr32" or "addr32;" to make GAS happy */
+#undef ADDR32
+
+/* Define it to "data32" or "data32;" to make GAS happy */
+#undef DATA32
+
+/* Define if opendisk() in -lutil can be used */
+#undef HAVE_OPENDISK
+
diff --git a/configure b/configure
index 662a27df2..afb17d96c 100644
--- a/configure
+++ b/configure
@@ -34,7 +34,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --disable-gunzip        disable decompression in Stage 2"
 ac_help="$ac_help
-  --disable-md5password   disable MD5 passwords in Stage 2"
+  --disable-md5-password  disable MD5 password support in Stage 2"
 ac_help="$ac_help
   --disable-packet-retransmission
                           turn off packet retransmission"
@@ -782,7 +782,7 @@ else
   echo "configure: warning: ${am_backtick}missing' script is too old or missing" 1>&2
 fi
 
-for ac_prog in mawk gawk nawk awk
+for ac_prog in gawk mawk nawk awk
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -2423,13 +2423,13 @@ if test x"$enable_gunzip" = xno; then
   FSYS_CFLAGS="$FSYS_CFLAGS -DNO_DECOMPRESSION=1"
 fi
 
-# Check whether --enable-md5password or --disable-md5password was given.
-if test "${enable_md5password+set}" = set; then
-  enableval="$enable_md5password"
+# Check whether --enable-md5-password or --disable-md5-password was given.
+if test "${enable_md5_password+set}" = set; then
+  enableval="$enable_md5_password"
   :
 fi
 
-if test "x$enable_md5password" != xno; then
+if test "x$enable_md5_password" != xno; then
   CFLAGS="$CFLAGS -DUSE_MD5_PASSWORDS=1"
 fi
 
diff --git a/configure.in b/configure.in
index 5649e2f17..19746bb59 100644
--- a/configure.in
+++ b/configure.in
@@ -230,9 +230,9 @@ if test x"$enable_gunzip" = xno; then
   FSYS_CFLAGS="$FSYS_CFLAGS -DNO_DECOMPRESSION=1"
 fi
 
-AC_ARG_ENABLE(md5password,
-  [  --disable-md5password   disable MD5 passwords in Stage 2])
-if test "x$enable_md5password" != xno; then
+AC_ARG_ENABLE(md5-password,
+  [  --disable-md5-password  disable MD5 password support in Stage 2])
+if test "x$enable_md5_password" != xno; then
   CFLAGS="$CFLAGS -DUSE_MD5_PASSWORDS=1"
 fi