summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--configure.ac7
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d5a62dcc5..724bb4f1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,8 @@
9 - (dtucker) [monitor.c] Remove the !HAVE_SOCKETPAIR case. We use socketpair 9 - (dtucker) [monitor.c] Remove the !HAVE_SOCKETPAIR case. We use socketpair
10 unconditionally in other places and the survey data we have does not show 10 unconditionally in other places and the survey data we have does not show
11 any systems that use it. "nuke it" djm@ 11 any systems that use it. "nuke it" djm@
12 - (djm) [configure.ac] enable setproctitle emulation for OS X
13 - (djm) OpenBSD CVS Sync
12 - djm@cvs.openbsd.org 2011/06/03 00:54:38 14 - djm@cvs.openbsd.org 2011/06/03 00:54:38
13 [ssh.c] 15 [ssh.c]
14 bz#1883 - setproctitle() to identify mux master; patch from Bert.Wesarg 16 bz#1883 - setproctitle() to identify mux master; patch from Bert.Wesarg
diff --git a/configure.ac b/configure.ac
index 51dea41c1..8f36338ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.475 2011/06/03 01:17:49 tim Exp $ 1# $Id: configure.ac,v 1.476 2011/06/03 02:11:38 djm Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -15,7 +15,7 @@
15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 16
17AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) 17AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org])
18AC_REVISION($Revision: 1.475 $) 18AC_REVISION($Revision: 1.476 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20AC_LANG([C]) 20AC_LANG([C])
21 21
@@ -512,6 +512,9 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
512 AC_DEFINE([LASTLOG_WRITE_PUTUTXLINE], [1], 512 AC_DEFINE([LASTLOG_WRITE_PUTUTXLINE], [1],
513 [Define if pututxline updates lastlog too]) 513 [Define if pututxline updates lastlog too])
514 ) 514 )
515 AC_DEFINE([SPT_TYPE], [SPT_REUSEARGV],
516 [Define to a Set Process Title type if your system is
517 supported by bsd-setproctitle.c])
515 ;; 518 ;;
516*-*-dragonfly*) 519*-*-dragonfly*)
517 SSHDLIBS="$SSHDLIBS -lcrypt" 520 SSHDLIBS="$SSHDLIBS -lcrypt"