summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2005-02-11 16:11:49 +1100
committerDarren Tucker <dtucker@zip.com.au>2005-02-11 16:11:49 +1100
commit1b6f2291e4adf4d3e7e81d35194b1ad7751270f2 (patch)
tree88f1d88f829503d2db8ab1c9c13ddfe33688e157
parent2f9573df714b221acbf92f8b48645849475136fa (diff)
- (dtucker) [configure.ac] Tidy up configure --help output.
-rw-r--r--ChangeLog5
-rw-r--r--configure.ac12
2 files changed, 9 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 35fb0ca1..2c932661 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20050211
+ - (dtucker) [configure.ac] Tidy up configure --help output.
+
20050210
- (dtucker) [configure.ac] Bug #919: Provide visible feedback for the
--disable-etc-default-login configure option.
@@ -2119,4 +2122,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.3648 2005/02/10 11:28:54 dtucker Exp $
+$Id: ChangeLog,v 1.3649 2005/02/11 05:11:49 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index 9d1d3328..2df8a5e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.240 2005/02/10 11:28:55 dtucker Exp $
+# $Id: configure.ac,v 1.241 2005/02/11 05:11:49 dtucker Exp $
#
# Copyright (c) 1999-2004 Damien Miller
#
@@ -766,8 +766,7 @@ fi
# Check whether user wants S/Key support
SKEY_MSG="no"
AC_ARG_WITH(skey,
- [ --with-skey[[=PATH]] Enable S/Key support
- (optionally in PATH)],
+ [ --with-skey[[=PATH]] Enable S/Key support (optionally in PATH)],
[
if test "x$withval" != "xno" ; then
@@ -808,8 +807,7 @@ int main() { char *ff = skey_keyinfo(""); ff=""; exit(0); }
# Check whether user wants TCP wrappers support
TCPW_MSG="no"
AC_ARG_WITH(tcp-wrappers,
- [ --with-tcp-wrappers[[=PATH]] Enable tcpwrappers support
- (optionally in PATH)],
+ [ --with-tcp-wrappers[[=PATH]] Enable tcpwrappers support (optionally in PATH)],
[
if test "x$withval" != "xno" ; then
saved_LIBS="$LIBS"
@@ -865,7 +863,7 @@ AC_ARG_WITH(tcp-wrappers,
# Check whether user wants libedit support
LIBEDIT_MSG="no"
AC_ARG_WITH(libedit,
- [ --with-libedit[[=PATH]] Enable libedit support for sftp],
+ [ --with-libedit[[=PATH]] Enable libedit support for sftp],
[ if test "x$withval" != "xno" ; then
AC_CHECK_LIB(edit, el_init,
[ AC_DEFINE(USE_LIBEDIT, [], [Use libedit for sftp])
@@ -2583,7 +2581,7 @@ 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]],
+ [ --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