diff options
author | Darren Tucker <dtucker@zip.com.au> | 2005-02-10 22:28:54 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2005-02-10 22:28:54 +1100 |
commit | 2f9573df714b221acbf92f8b48645849475136fa (patch) | |
tree | e47752597eaf4b8fc78fecbc5c3e0019e1b57b5a | |
parent | 33370e0287649c135eef8e7a0e22aee754deeac5 (diff) |
- (dtucker) [configure.ac] Bug #919: Provide visible feedback for the
--disable-etc-default-login configure option.
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | configure.ac | 20 |
2 files changed, 19 insertions, 7 deletions
@@ -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 @@ -2115,4 +2119,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3647 2005/02/09 11:17:28 dtucker Exp $ +$Id: ChangeLog,v 1.3648 2005/02/10 11:28:54 dtucker Exp $ diff --git a/configure.ac b/configure.ac index e79e89ac..9d1d3328 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.239 2005/02/09 11:17:28 dtucker Exp $ +# $Id: configure.ac,v 1.240 2005/02/10 11:28:55 dtucker Exp $ # # Copyright (c) 1999-2004 Damien Miller # @@ -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 \ |