summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac6
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d2a382e9c..4c4ba7c1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120041208
2 - (tim) [configure.ac] Comment some non obvious platforms in the
3 target-specific case statement. Suggested and OK by dtucker@
4
120041207 520041207
2 - (dtucker) [regress/scp.sh] Use portable-friendly $DIFFOPTs in new test. 6 - (dtucker) [regress/scp.sh] Use portable-friendly $DIFFOPTs in new test.
3 7
@@ -1923,4 +1927,4 @@
1923 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1927 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1924 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1928 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1925 1929
1926$Id: ChangeLog,v 1.3599 2004/12/07 00:26:15 dtucker Exp $ 1930$Id: ChangeLog,v 1.3600 2004/12/09 02:29:58 tim Exp $
diff --git a/configure.ac b/configure.ac
index f60bbdd27..4b40b768a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.233 2004/11/07 09:14:34 dtucker Exp $ 1# $Id: configure.ac,v 1.234 2004/12/09 02:29:59 tim Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -348,12 +348,14 @@ mips-sony-bsd|mips-sony-newsos4)
348 # Attention: always take care to bind libsocket and libnsl before libc, 348 # Attention: always take care to bind libsocket and libnsl before libc,
349 # otherwise you will find lots of "SIOCGPGRP errno 22" on syslog 349 # otherwise you will find lots of "SIOCGPGRP errno 22" on syslog
350 ;; 350 ;;
351# UnixWare 1.x, UnixWare 2.x, and others based on code from Univel.
351*-*-sysv4.2*) 352*-*-sysv4.2*)
352 AC_DEFINE(USE_PIPES) 353 AC_DEFINE(USE_PIPES)
353 AC_DEFINE(SETEUID_BREAKS_SETUID) 354 AC_DEFINE(SETEUID_BREAKS_SETUID)
354 AC_DEFINE(BROKEN_SETREUID) 355 AC_DEFINE(BROKEN_SETREUID)
355 AC_DEFINE(BROKEN_SETREGID) 356 AC_DEFINE(BROKEN_SETREGID)
356 ;; 357 ;;
358# UnixWare 7.x, OpenUNIX 8
357*-*-sysv5*) 359*-*-sysv5*)
358 AC_DEFINE(USE_PIPES) 360 AC_DEFINE(USE_PIPES)
359 AC_DEFINE(SETEUID_BREAKS_SETUID) 361 AC_DEFINE(SETEUID_BREAKS_SETUID)
@@ -362,6 +364,7 @@ mips-sony-bsd|mips-sony-newsos4)
362 ;; 364 ;;
363*-*-sysv*) 365*-*-sysv*)
364 ;; 366 ;;
367# SCO UNIX and OEM versions of SCO UNIX
365*-*-sco3.2v4*) 368*-*-sco3.2v4*)
366 CPPFLAGS="$CPPFLAGS -Dftruncate=chsize" 369 CPPFLAGS="$CPPFLAGS -Dftruncate=chsize"
367 LIBS="$LIBS -los -lprot -lcrypt_i -lx -ltinfo -lm" 370 LIBS="$LIBS -los -lprot -lcrypt_i -lx -ltinfo -lm"
@@ -381,6 +384,7 @@ mips-sony-bsd|mips-sony-newsos4)
381 do_sco3_extra_lib_check=yes 384 do_sco3_extra_lib_check=yes
382 TEST_SHELL=ksh 385 TEST_SHELL=ksh
383 ;; 386 ;;
387# SCO OpenServer 5.x
384*-*-sco3.2v5*) 388*-*-sco3.2v5*)
385 if test -z "$GCC"; then 389 if test -z "$GCC"; then
386 CFLAGS="$CFLAGS -belf" 390 CFLAGS="$CFLAGS -belf"