summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Rice <tim@multitalents.net>2003-09-22 19:51:36 -0700
committerTim Rice <tim@multitalents.net>2003-09-22 19:51:36 -0700
commitefa09bf250909dca709deb74402ff6a8e86cc3c1 (patch)
tree2b9d7969bc05a1bb1f04e19ef2697a6ca408f984
parentd77263ea5c4f0df91bfec4ecef6e69643c9065dc (diff)
[configure.ac] add --disable-etc-default-login option. ok djm
-rw-r--r--ChangeLog3
-rw-r--r--configure.ac6
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 643aafa9..46700ecf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,7 @@
Report by distler AT golem ph utexas edu.
- (dtucker) [contrib/aix/pam.conf] Include example pam.conf for AIX from
article by genty at austin.ibm.com, included with the author's permission.
+ - (tim) [configure.ac] add --disable-etc-default-login option. ok djm
20030919
- (djm) Bug #683: Remove reference to --with-ipv4-default from INSTALL;
@@ -1161,4 +1162,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au
-$Id: ChangeLog,v 1.2994.2.26 2003/09/22 10:42:16 dtucker Exp $
+$Id: ChangeLog,v 1.2994.2.27 2003/09/23 02:51:36 tim Exp $
diff --git a/configure.ac b/configure.ac
index 15f6e1f4..71643108 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.154.2.9 2003/09/22 04:39:14 tim Exp $
+# $Id: configure.ac,v 1.154.2.10 2003/09/23 02:51:37 tim Exp $
AC_INIT
AC_CONFIG_SRCDIR([ssh.c])
@@ -2215,11 +2215,15 @@ else
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 ])
if test "x$external_path_file" = "x/etc/default/login"; then
AC_DEFINE(HAVE_ETC_DEFAULT_LOGIN)
fi
+])
dnl BSD systems use /etc/login.conf so --with-default-path= has no effect
if test $ac_cv_func_login_getcapbool = "yes" -a \