summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--configure.ac27
2 files changed, 4 insertions, 26 deletions
diff --git a/ChangeLog b/ChangeLog
index bf577514b..cfe5e81b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,7 @@
19 [Makefile envpass.sh] 19 [Makefile envpass.sh]
20 regress test for SendEnv config parsing bug; ok dtucker@ 20 regress test for SendEnv config parsing bug; ok dtucker@
21 - (dtucker) [regress/test-exec.sh] Put SUDO in the right place. 21 - (dtucker) [regress/test-exec.sh] Put SUDO in the right place.
22 - (tim) [configure.ac] SCO 3.2v4.2 no longer supported.
22 23
2320050306 2420050306
24 - (dtucker) [monitor.c] Bug #125 comment #47: fix errors returned by monitor 25 - (dtucker) [monitor.c] Bug #125 comment #47: fix errors returned by monitor
@@ -2305,4 +2306,4 @@
2305 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 2306 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
2306 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 2307 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
2307 2308
2308$Id: ChangeLog,v 1.3701 2005/03/07 08:15:06 dtucker Exp $ 2309$Id: ChangeLog,v 1.3702 2005/03/07 09:21:37 tim Exp $
diff --git a/configure.ac b/configure.ac
index b145e127a..e48028b7b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.249 2005/03/07 06:34:46 dtucker Exp $ 1# $Id: configure.ac,v 1.250 2005/03/07 09:21:37 tim Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -373,23 +373,7 @@ mips-sony-bsd|mips-sony-newsos4)
373 ;; 373 ;;
374# SCO UNIX and OEM versions of SCO UNIX 374# SCO UNIX and OEM versions of SCO UNIX
375*-*-sco3.2v4*) 375*-*-sco3.2v4*)
376 CPPFLAGS="$CPPFLAGS -Dftruncate=chsize" 376 AC_MSG_ERROR("This Platform is no longer supported.")
377 LIBS="$LIBS -los -lprot -lcrypt_i -lx -ltinfo -lm"
378 RANLIB=true
379 no_dev_ptmx=1
380 AC_DEFINE(BROKEN_SYS_TERMIO_H)
381 AC_DEFINE(USE_PIPES)
382 AC_DEFINE(HAVE_SECUREWARE)
383 AC_DEFINE(DISABLE_SHADOW)
384 AC_DEFINE(BROKEN_SAVED_UIDS)
385 AC_DEFINE(SETEUID_BREAKS_SETUID)
386 AC_DEFINE(BROKEN_SETREUID)
387 AC_DEFINE(BROKEN_SETREGID)
388 AC_DEFINE(WITH_ABBREV_NO_TTY)
389 AC_CHECK_FUNCS(getluid setluid)
390 MANTYPE=man
391 do_sco3_extra_lib_check=yes
392 TEST_SHELL=ksh
393 ;; 377 ;;
394# SCO OpenServer 5.x 378# SCO OpenServer 5.x
395*-*-sco3.2v5*) 379*-*-sco3.2v5*)
@@ -555,13 +539,6 @@ AC_CHECK_HEADERS(sys/ptms.h, [], [], [
555AC_CHECK_FUNC(yp_match, , AC_CHECK_LIB(nsl, yp_match)) 539AC_CHECK_FUNC(yp_match, , AC_CHECK_LIB(nsl, yp_match))
556AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt)) 540AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt))
557 541
558dnl SCO OS3 needs this for libwrap
559if test "x$with_tcp_wrappers" != "xno" ; then
560 if test "x$do_sco3_extra_lib_check" = "xyes" ; then
561 AC_CHECK_LIB(rpc, innetgr, LIBS="-lrpc -lyp -lrpc $LIBS" , , -lyp -lrpc)
562 fi
563fi
564
565dnl IRIX and Solaris 2.5.1 have dirname() in libgen 542dnl IRIX and Solaris 2.5.1 have dirname() in libgen
566AC_CHECK_FUNCS(dirname, [AC_CHECK_HEADERS(libgen.h)] ,[ 543AC_CHECK_FUNCS(dirname, [AC_CHECK_HEADERS(libgen.h)] ,[
567 AC_CHECK_LIB(gen, dirname,[ 544 AC_CHECK_LIB(gen, dirname,[