diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2003-06-28 04:54:33 +0200 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2003-06-28 04:54:33 +0200 |
| commit | a3020db6b44fd898c49d07dcbb2afc5db4c4c5b2 (patch) | |
| tree | d263a83a4bf7bb20723c1ed9ed4452f4c94aff89 | |
| parent | - (dtucker) [regress/dynamic-forward.sh] Import new regression test. (diff) | |
| download | openssh-a3020db6b44fd898c49d07dcbb2afc5db4c4c5b2.tar.xz openssh-a3020db6b44fd898c49d07dcbb2afc5db4c4c5b2.zip | |
- (dtucker) [configure.ac] Bug #570: Have ./configure --enable-FEATURE
actually enable the feature, for those normally disabled. Patch by
openssh (at) roumenpetrov.info.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.ac | 50 |
2 files changed, 45 insertions, 10 deletions
@@ -14,6 +14,9 @@ [readconf.c] do not dump core for 'ssh -o proxycommand host'; ok deraadt@ - (dtucker) [regress/dynamic-forward.sh] Import new regression test. + - (dtucker) [configure.ac] Bug #570: Have ./configure --enable-FEATURE + actually enable the feature, for those normally disabled. Patch by + openssh (at) roumenpetrov.info. 20030624 - (dtucker) Have configure refer the user to config.log and @@ -600,4 +603,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.2828 2003/06/28 02:42:09 dtucker Exp $ +$Id: ChangeLog,v 1.2829 2003/06/28 02:54:33 dtucker Exp $ diff --git a/configure.ac b/configure.ac index 8afa7aaf6..0992744c1 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.127 2003/06/24 10:22:10 dtucker Exp $ +# $Id: configure.ac,v 1.128 2003/06/28 02:54:33 dtucker Exp $ AC_INIT AC_CONFIG_SRCDIR([ssh.c]) @@ -2314,35 +2314,67 @@ AC_SUBST(piddir) dnl allow user to disable some login recording features AC_ARG_ENABLE(lastlog, [ --disable-lastlog disable use of lastlog even if detected [no]], - [ AC_DEFINE(DISABLE_LASTLOG) ] + [ + if test "x$enableval" = "xno" ; then + AC_DEFINE(DISABLE_LASTLOG) + fi + ] ) AC_ARG_ENABLE(utmp, [ --disable-utmp disable use of utmp even if detected [no]], - [ AC_DEFINE(DISABLE_UTMP) ] + [ + if test "x$enableval" = "xno" ; then + AC_DEFINE(DISABLE_UTMP) + fi + ] ) AC_ARG_ENABLE(utmpx, [ --disable-utmpx disable use of utmpx even if detected [no]], - [ AC_DEFINE(DISABLE_UTMPX) ] + [ + if test "x$enableval" = "xno" ; then + AC_DEFINE(DISABLE_UTMPX) + fi + ] ) AC_ARG_ENABLE(wtmp, [ --disable-wtmp disable use of wtmp even if detected [no]], - [ AC_DEFINE(DISABLE_WTMP) ] + [ + if test "x$enableval" = "xno" ; then + AC_DEFINE(DISABLE_WTMP) + fi + ] ) AC_ARG_ENABLE(wtmpx, [ --disable-wtmpx disable use of wtmpx even if detected [no]], - [ AC_DEFINE(DISABLE_WTMPX) ] + [ + if test "x$enableval" = "xno" ; then + AC_DEFINE(DISABLE_WTMPX) + fi + ] ) AC_ARG_ENABLE(libutil, [ --disable-libutil disable use of libutil (login() etc.) [no]], - [ AC_DEFINE(DISABLE_LOGIN) ] + [ + if test "x$enableval" = "xno" ; then + AC_DEFINE(DISABLE_LOGIN) + fi + ] ) AC_ARG_ENABLE(pututline, [ --disable-pututline disable use of pututline() etc. ([uw]tmp) [no]], - [ AC_DEFINE(DISABLE_PUTUTLINE) ] + [ + if test "x$enableval" = "xno" ; then + AC_DEFINE(DISABLE_PUTUTLINE) + fi + ] ) AC_ARG_ENABLE(pututxline, [ --disable-pututxline disable use of pututxline() etc. ([uw]tmpx) [no]], - [ AC_DEFINE(DISABLE_PUTUTXLINE) ] + [ + if test "x$enableval" = "xno" ; then + AC_DEFINE(DISABLE_PUTUTXLINE) + fi + ] ) AC_ARG_WITH(lastlog, [ --with-lastlog=FILE|DIR specify lastlog location [common locations]], |