summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--configure.ac50
2 files changed, 45 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 19dbe0278..4b4bcf2cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,9 @@
14 [readconf.c] 14 [readconf.c]
15 do not dump core for 'ssh -o proxycommand host'; ok deraadt@ 15 do not dump core for 'ssh -o proxycommand host'; ok deraadt@
16 - (dtucker) [regress/dynamic-forward.sh] Import new regression test. 16 - (dtucker) [regress/dynamic-forward.sh] Import new regression test.
17 - (dtucker) [configure.ac] Bug #570: Have ./configure --enable-FEATURE
18 actually enable the feature, for those normally disabled. Patch by
19 openssh (at) roumenpetrov.info.
17 20
1820030624 2120030624
19 - (dtucker) Have configure refer the user to config.log and 22 - (dtucker) Have configure refer the user to config.log and
@@ -600,4 +603,4 @@
600 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 603 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
601 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 604 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
602 605
603$Id: ChangeLog,v 1.2828 2003/06/28 02:42:09 dtucker Exp $ 606$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 @@
1# $Id: configure.ac,v 1.127 2003/06/24 10:22:10 dtucker Exp $ 1# $Id: configure.ac,v 1.128 2003/06/28 02:54:33 dtucker Exp $
2 2
3AC_INIT 3AC_INIT
4AC_CONFIG_SRCDIR([ssh.c]) 4AC_CONFIG_SRCDIR([ssh.c])
@@ -2314,35 +2314,67 @@ AC_SUBST(piddir)
2314dnl allow user to disable some login recording features 2314dnl allow user to disable some login recording features
2315AC_ARG_ENABLE(lastlog, 2315AC_ARG_ENABLE(lastlog,
2316 [ --disable-lastlog disable use of lastlog even if detected [no]], 2316 [ --disable-lastlog disable use of lastlog even if detected [no]],
2317 [ AC_DEFINE(DISABLE_LASTLOG) ] 2317 [
2318 if test "x$enableval" = "xno" ; then
2319 AC_DEFINE(DISABLE_LASTLOG)
2320 fi
2321 ]
2318) 2322)
2319AC_ARG_ENABLE(utmp, 2323AC_ARG_ENABLE(utmp,
2320 [ --disable-utmp disable use of utmp even if detected [no]], 2324 [ --disable-utmp disable use of utmp even if detected [no]],
2321 [ AC_DEFINE(DISABLE_UTMP) ] 2325 [
2326 if test "x$enableval" = "xno" ; then
2327 AC_DEFINE(DISABLE_UTMP)
2328 fi
2329 ]
2322) 2330)
2323AC_ARG_ENABLE(utmpx, 2331AC_ARG_ENABLE(utmpx,
2324 [ --disable-utmpx disable use of utmpx even if detected [no]], 2332 [ --disable-utmpx disable use of utmpx even if detected [no]],
2325 [ AC_DEFINE(DISABLE_UTMPX) ] 2333 [
2334 if test "x$enableval" = "xno" ; then
2335 AC_DEFINE(DISABLE_UTMPX)
2336 fi
2337 ]
2326) 2338)
2327AC_ARG_ENABLE(wtmp, 2339AC_ARG_ENABLE(wtmp,
2328 [ --disable-wtmp disable use of wtmp even if detected [no]], 2340 [ --disable-wtmp disable use of wtmp even if detected [no]],
2329 [ AC_DEFINE(DISABLE_WTMP) ] 2341 [
2342 if test "x$enableval" = "xno" ; then
2343 AC_DEFINE(DISABLE_WTMP)
2344 fi
2345 ]
2330) 2346)
2331AC_ARG_ENABLE(wtmpx, 2347AC_ARG_ENABLE(wtmpx,
2332 [ --disable-wtmpx disable use of wtmpx even if detected [no]], 2348 [ --disable-wtmpx disable use of wtmpx even if detected [no]],
2333 [ AC_DEFINE(DISABLE_WTMPX) ] 2349 [
2350 if test "x$enableval" = "xno" ; then
2351 AC_DEFINE(DISABLE_WTMPX)
2352 fi
2353 ]
2334) 2354)
2335AC_ARG_ENABLE(libutil, 2355AC_ARG_ENABLE(libutil,
2336 [ --disable-libutil disable use of libutil (login() etc.) [no]], 2356 [ --disable-libutil disable use of libutil (login() etc.) [no]],
2337 [ AC_DEFINE(DISABLE_LOGIN) ] 2357 [
2358 if test "x$enableval" = "xno" ; then
2359 AC_DEFINE(DISABLE_LOGIN)
2360 fi
2361 ]
2338) 2362)
2339AC_ARG_ENABLE(pututline, 2363AC_ARG_ENABLE(pututline,
2340 [ --disable-pututline disable use of pututline() etc. ([uw]tmp) [no]], 2364 [ --disable-pututline disable use of pututline() etc. ([uw]tmp) [no]],
2341 [ AC_DEFINE(DISABLE_PUTUTLINE) ] 2365 [
2366 if test "x$enableval" = "xno" ; then
2367 AC_DEFINE(DISABLE_PUTUTLINE)
2368 fi
2369 ]
2342) 2370)
2343AC_ARG_ENABLE(pututxline, 2371AC_ARG_ENABLE(pututxline,
2344 [ --disable-pututxline disable use of pututxline() etc. ([uw]tmpx) [no]], 2372 [ --disable-pututxline disable use of pututxline() etc. ([uw]tmpx) [no]],
2345 [ AC_DEFINE(DISABLE_PUTUTXLINE) ] 2373 [
2374 if test "x$enableval" = "xno" ; then
2375 AC_DEFINE(DISABLE_PUTUTXLINE)
2376 fi
2377 ]
2346) 2378)
2347AC_ARG_WITH(lastlog, 2379AC_ARG_WITH(lastlog,
2348 [ --with-lastlog=FILE|DIR specify lastlog location [common locations]], 2380 [ --with-lastlog=FILE|DIR specify lastlog location [common locations]],