--with-getpass -> --{enable,disable}-tgetpass

diff --git a/configure.in b/configure.in
index d73941d78116b6abc755a1aad448d4ecd968806b..3ebee1982a0d726c98c5f2231403c7b9e38a7ed9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -49,6 +49,62 @@ test "$bindir" = '${exec_prefix}/bin' && bindir='$(exec_prefix)/bin'
 test "$sbindir" = '${exec_prefix}/sbin' && sbindir='$(exec_prefix)/etc'
 test "$sysconfdir" = '${prefix}/etc' && sysconfdir='/etc'
 
+dnl
+dnl Options for --enable
+dnl
+
+AC_MSG_CHECKING(whether to use the system getpass function)
+AC_ARG_ENABLE(tgetpass,
+[  --enable-tgetpass       Use sudo's getpass() that times out (default)
+  --disable-tgetpass      Use the system getpass() instead of sudo's version],
+[ case "$enableval" in
+    yes)       AC_MSG_RESULT(no)
+               ;;
+    no)                AC_MSG_RESULT(yes)
+               AC_DEFINE(USE_GETPASS)
+               TGETPASS=""
+               ;;
+    *)         AC_MSG_RESULT(no)
+               echo "Ignoring unknown argument to --enable-tgetpass: $enableval"
+               ;;
+  esac
+], AC_MSG_RESULT(no))
+
+AC_MSG_CHECKING(whether to log the hostname in the log file)
+AC_ARG_ENABLE(log-host,
+[  --enable-log-host       Log the hostname in the log file
+  --disable-log-host      Do not log hostname in the log file (default)],
+[ case "$enableval" in
+    yes)       AC_MSG_RESULT(yes)
+               AC_DEFINE(HOST_IN_LOG)
+               ;;
+    no)                AC_MSG_RESULT(no)
+               ;;
+    *)         AC_MSG_RESULT(no)
+               echo "Ignoring unknown argument to --enable-log-host: $enableval"
+               ;;
+  esac
+], AC_MSG_RESULT(no))
+
+AC_MSG_CHECKING(whether to wrap long lines in the log file)
+AC_ARG_ENABLE(log-wrap,
+[  --enable-log-wrap       Wrap long lines in the log file (default)
+  --disable-log-wrap      Do not wrap long lines in the log file],
+[ case "$enableval" in
+    yes)       AC_MSG_RESULT(yes)
+               AC_DEFINE(WRAP_LOG)
+               ;;
+    no)                AC_MSG_RESULT(no)
+               ;;
+    *)         AC_MSG_RESULT(yes)
+               AC_DEFINE(WRAP_LOG)
+               echo "Ignoring unknown argument to --enable-log-wrap: $enableval"
+               ;;
+  esac
+], AC_MSG_RESULT(yes)
+  AC_DEFINE(WRAP_LOG)
+)
+
 dnl
 dnl Options for --with
 dnl
@@ -65,17 +121,6 @@ AC_ARG_WITH(CC, [  --with-CC               C compiler to use],
                ;;
 esac])
 
-AC_ARG_WITH(getpass, [  --with-getpass          use system getpass(3)],
-[case $with_getpass in
-    yes)       AC_DEFINE(USE_GETPASS)
-               echo 'Using system getpass'
-               TGETPASS=""
-               ;;
-    no)                ;;
-    *)         echo "Ignoring unknown argument to --with-getpass: $with_getpass"
-               ;;
-esac])
-
 AC_ARG_WITH(C2, [  --with-C2               enable C2 security (shadow password) support],
 [case $with_C2 in
     yes)       echo 'Configuring for C2 security (shadow passwords)'
@@ -261,37 +306,6 @@ AC_ARG_WITH(csops, [  --with-csops            add CSOps standard options],
                ;;
 esac])
 
-AC_MSG_CHECKING(whether to log the hostname in the log file)
-AC_ARG_ENABLE(log-host,
-[  --enable-log-host       Log the hostname in the log file
-  --disable-log-host      Do not log hostname in the log file (default)],
-[ case "$enableval" in
-  yes)
-       AC_MSG_RESULT(yes)
-               AC_DEFINE(HOST_IN_LOG)
-       ;;
-  *)   AC_MSG_RESULT(no)
-       ;;
-  esac ],
-  AC_MSG_RESULT(no)
-)
-
-AC_MSG_CHECKING(whether to wrap long lines in the log file)
-AC_ARG_ENABLE(log-wrap,
-[  --enable-log-wrap       Wrap long lines in the log file (default)
-  --disable-log-wrap      Do not wrap long lines in the log file],
-[ case "$enableval" in
-  no)
-       AC_MSG_RESULT(no)
-       ;;
-  *)   AC_MSG_RESULT(yes)
-               AC_DEFINE(WRAP_LOG)
-       ;;
-  esac ],
-  AC_MSG_RESULT(yes)
-  AC_DEFINE(WRAP_LOG)
-)
-
 dnl
 dnl If we don't have egrep we can't do anything...
 dnl