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

--disable-etc-default-login configure option.
This commit is contained in:
Darren Tucker 2005-02-10 22:28:54 +11:00
parent 33370e0287
commit 2f9573df71
2 changed files with 19 additions and 7 deletions

View File

@ -1,3 +1,7 @@
20050210
- (dtucker) [configure.ac] Bug #919: Provide visible feedback for the
--disable-etc-default-login configure option.
20050209 20050209
- (dtucker) OpenBSD CVS Sync - (dtucker) OpenBSD CVS Sync
- dtucker@cvs.openbsd.org 2005/01/28 09:45:53 - dtucker@cvs.openbsd.org 2005/01/28 09:45:53
@ -2115,4 +2119,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (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 $

View File

@ -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 # Copyright (c) 1999-2004 Damien Miller
# #
@ -2583,18 +2583,26 @@ fi
# check for /etc/default/login and use it if present. # check for /etc/default/login and use it if present.
AC_ARG_ENABLE(etc-default-login, AC_ARG_ENABLE(etc-default-login,
[ --disable-etc-default-login Disable using PATH from /etc/default/login [no]],, [ --disable-etc-default-login Disable using PATH from /etc/default/login [no]],
[ AC_CHECK_FILE("/etc/default/login", [ if test "x$enableval" = "xno"; then
[ external_path_file=/etc/default/login ]) 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"; if test ! -z "$cross_compiling" && test "x$cross_compiling" = "xyes";
then then
AC_MSG_WARN([cross compiling: Disabling /etc/default/login test]) AC_MSG_WARN([cross compiling: Disabling /etc/default/login test])
elif test "x$external_path_file" = "x/etc/default/login"; then elif test "x$external_path_file" = "x/etc/default/login"; then
AC_DEFINE(HAVE_ETC_DEFAULT_LOGIN) AC_DEFINE(HAVE_ETC_DEFAULT_LOGIN)
fi fi
] fi
)
dnl BSD systems use /etc/login.conf so --with-default-path= has no effect dnl BSD systems use /etc/login.conf so --with-default-path= has no effect
if test $ac_cv_func_login_getcapbool = "yes" -a \ if test $ac_cv_func_login_getcapbool = "yes" -a \