- (dtucker) [configure.ac] Tidy up configure --help output.

This commit is contained in:
Darren Tucker 2005-02-11 16:11:49 +11:00
parent 2f9573df71
commit 1b6f2291e4
2 changed files with 9 additions and 8 deletions

View File

@ -1,3 +1,6 @@
20050211
- (dtucker) [configure.ac] Tidy up configure --help output.
20050210 20050210
- (dtucker) [configure.ac] Bug #919: Provide visible feedback for the - (dtucker) [configure.ac] Bug #919: Provide visible feedback for the
--disable-etc-default-login configure option. --disable-etc-default-login configure option.
@ -2119,4 +2122,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.3648 2005/02/10 11:28:54 dtucker Exp $ $Id: ChangeLog,v 1.3649 2005/02/11 05:11:49 dtucker Exp $

View File

@ -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 # Copyright (c) 1999-2004 Damien Miller
# #
@ -766,8 +766,7 @@ fi
# Check whether user wants S/Key support # Check whether user wants S/Key support
SKEY_MSG="no" SKEY_MSG="no"
AC_ARG_WITH(skey, AC_ARG_WITH(skey,
[ --with-skey[[=PATH]] Enable S/Key support [ --with-skey[[=PATH]] Enable S/Key support (optionally in PATH)],
(optionally in PATH)],
[ [
if test "x$withval" != "xno" ; then 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 # Check whether user wants TCP wrappers support
TCPW_MSG="no" TCPW_MSG="no"
AC_ARG_WITH(tcp-wrappers, AC_ARG_WITH(tcp-wrappers,
[ --with-tcp-wrappers[[=PATH]] Enable tcpwrappers support [ --with-tcp-wrappers[[=PATH]] Enable tcpwrappers support (optionally in PATH)],
(optionally in PATH)],
[ [
if test "x$withval" != "xno" ; then if test "x$withval" != "xno" ; then
saved_LIBS="$LIBS" saved_LIBS="$LIBS"
@ -865,7 +863,7 @@ AC_ARG_WITH(tcp-wrappers,
# Check whether user wants libedit support # Check whether user wants libedit support
LIBEDIT_MSG="no" LIBEDIT_MSG="no"
AC_ARG_WITH(libedit, 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 [ if test "x$withval" != "xno" ; then
AC_CHECK_LIB(edit, el_init, AC_CHECK_LIB(edit, el_init,
[ AC_DEFINE(USE_LIBEDIT, [], [Use libedit for sftp]) [ AC_DEFINE(USE_LIBEDIT, [], [Use libedit for sftp])
@ -2583,7 +2581,7 @@ 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]],
[ if test "x$enableval" = "xno"; then [ if test "x$enableval" = "xno"; then
AC_MSG_NOTICE([/etc/default/login handling disabled]) AC_MSG_NOTICE([/etc/default/login handling disabled])
etc_default_login=no etc_default_login=no