- (dtucker) [configure.ac] Bug #919: Provide visible feedback for the

   --disable-etc-default-login configure option.

diff --git a/ChangeLog b/ChangeLog
index 11c0da61cadfdb3110fc80261f38ba2fae4fc18c..ee26825c940f4fe44d17d60e17fefab06a227135 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20050210
+ - (dtucker) [configure.ac] Bug #919: Provide visible feedback for the
+   --disable-etc-default-login configure option.
+
 20050209
  - (dtucker) OpenBSD CVS Sync
    - dtucker@cvs.openbsd.org 2005/01/28 09:45:53

diff --git a/configure.ac b/configure.ac
index a0038ae5471accf52d283d7ee3697d4eef27efcf..86e539813da69ebe13ce6ac15819ba9d142d34b8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2583,18 +2583,26 @@ fi
 
 # check for /etc/default/login and use it if present.
 AC_ARG_ENABLE(etc-default-login,
-       [  --disable-etc-default-login       Disable using PATH from /etc/default/login [no]],,
-       [ AC_CHECK_FILE("/etc/default/login",
-           [ external_path_file=/etc/default/login ])
+       [  --disable-etc-default-login       Disable using PATH from /etc/default/login [no]],
+       [ if test "x$enableval" = "xno"; then
+               AC_MSG_NOTICE([/etc/default/login handling disabled])
+               etc_default_login=no
+         else
+               etc_default_login=yes
+         fi ],
+       [ etc_default_login=yes ]
+)
 
+if test "x$etc_default_login" != "xno"; then
+       AC_CHECK_FILE("/etc/default/login",
+           [ external_path_file=/etc/default/login ])
        if test ! -z "$cross_compiling" && test "x$cross_compiling" = "xyes";
        then
                AC_MSG_WARN([cross compiling: Disabling /etc/default/login test])
        elif test "x$external_path_file" = "x/etc/default/login"; then
                AC_DEFINE(HAVE_ETC_DEFAULT_LOGIN)
        fi
-       ]
-)
+fi
 
 dnl BSD systems use /etc/login.conf so --with-default-path= has no effect
 if test $ac_cv_func_login_getcapbool = "yes" -a \