summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Rice <tim@multitalents.net>2006-09-24 12:08:59 -0700
committerTim Rice <tim@multitalents.net>2006-09-24 12:08:59 -0700
commit983b35b281fa9981acfdf23cd5813897720d1445 (patch)
tree31237be24a106e57b928016ced49f3b93d3813f3
parent0ee3cbfc519c3be5f842e1ebac1ccc0841ce75d3 (diff)
20060924
- (tim) [configure.ac] Remove CFLAGS hack for UnixWare 1.x/2.x (added to rev 1.308) to work around broken gcc 2.x header file.
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac5
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 78abba7d1..4ac8dc4fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120060924
2 - (tim) [configure.ac] Remove CFLAGS hack for UnixWare 1.x/2.x (added
3 to rev 1.308) to work around broken gcc 2.x header file.
4
120060923 520060923
2 - (dtucker) [configure.ac] Bug #1234: Put opensc libs into $LIBS rather than 6 - (dtucker) [configure.ac] Bug #1234: Put opensc libs into $LIBS rather than
3 $LDFLAGS. Patch from vapier at gentoo org. 7 $LDFLAGS. Patch from vapier at gentoo org.
@@ -5478,4 +5482,4 @@
5478 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 5482 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
5479 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 5483 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
5480 5484
5481$Id: ChangeLog,v 1.4557 2006/09/23 06:25:19 dtucker Exp $ 5485$Id: ChangeLog,v 1.4558 2006/09/24 19:08:59 tim Exp $
diff --git a/configure.ac b/configure.ac
index 01e84104d..cfcd0272d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.366 2006/09/23 06:25:20 dtucker Exp $ 1# $Id: configure.ac,v 1.367 2006/09/24 19:08:59 tim 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.366 $) 18AC_REVISION($Revision: 1.367 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20 20
21AC_CONFIG_HEADER(config.h) 21AC_CONFIG_HEADER(config.h)
@@ -514,7 +514,6 @@ mips-sony-bsd|mips-sony-newsos4)
514 ;; 514 ;;
515# UnixWare 1.x, UnixWare 2.x, and others based on code from Univel. 515# UnixWare 1.x, UnixWare 2.x, and others based on code from Univel.
516*-*-sysv4.2*) 516*-*-sysv4.2*)
517 CFLAGS="$CFLAGS -Dva_list=_VA_LIST"
518 AC_DEFINE(USE_PIPES) 517 AC_DEFINE(USE_PIPES)
519 AC_DEFINE(SETEUID_BREAKS_SETUID) 518 AC_DEFINE(SETEUID_BREAKS_SETUID)
520 AC_DEFINE(BROKEN_SETREUID) 519 AC_DEFINE(BROKEN_SETREUID)