You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by Brian Behlendorf <br...@hyperreal.com> on 1997/01/08 05:47:51 UTC

Patch for apache_1.2b4 and Interactive Unix (fwd)


--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--
brian@hyperreal.com     http://www.apache.org     http://www.organic.com/jobs

---------- Forwarded message ----------
Date: Tue, 7 Jan 1997 02:57:20 +0200 (EET)
From: Winfried Koenig <wi...@in.rhein-main.de>
To: new-httpd@hyperreal.com
Subject: Patch for apache_1.2b4 and Interactive Unix


With the following patches I compiled and tested basic functions
of Apache 1.2b4 on Interactive Unix Release = 4.1.

Winfried


*** src/helpers/GuessOS.orig	Wed Dec 11 15:48:59 1996
--- src/helpers/GuessOS	Mon Jan  6 17:49:33 1997
***************
*** 19,47 ****
  VERSION=`(uname -v) 2>/dev/null` || VERSION="unknown"
  
  
! # Now test for SCO, since it is has a braindamaged uname.
  #
  # We need to work around FreeBSD 1.1.5.1 
! SCO=`uname -X 2>/dev/null | grep "^Release" | awk '{print $3}'`
! if [ "x$SCO" != "x" ]; then
!     case "$SCO" in
!    	3.2v4.2)
! 	    echo "whatever-whatever-sco3"; exit 0
! 	    ;;
! 	3.2v5.0*)
! 	    echo "whatever-whatever-sco5"; exit 0
! 	    ;;
! 	4.2MP)
!             if [ "x$VERSION" = "x2.1.1" ]; then
!                 echo "${MACHINE}-whatever-unixware211"; exit 0
!             else
!                 echo "${MACHINE}-whatever-unixware2"; exit 0
!             fi
! 	    ;;
! 	4.2)
! 	    echo "whatever-whatever-unixware1"; exit 0
! 	    ;;
!     esac
  else
  # Now we simply scan though... In most cases, the SYSTEM info is enough
  #
--- 19,55 ----
  VERSION=`(uname -v) 2>/dev/null` || VERSION="unknown"
  
  
! # Now test for ISC and SCO, since it is has a braindamaged uname.
  #
  # We need to work around FreeBSD 1.1.5.1 
! XREL=`uname -X 2>/dev/null | grep "^Release" | awk '{print $3}'`
! if [ "x$XREL" != "x" ]; then
!     if [ -f /etc/kconfig ]; then
! 	case "$XREL" in
! 	    4.0|4.1)
! 		    echo "${MACHINE}-whatever-isc4"; exit 0
! 		;;
! 	esac
!     else
! 	case "$XREL" in
! 	    3.2v4.2)
! 		echo "whatever-whatever-sco3"; exit 0
! 		;;
! 	    3.2v5.0*)
! 		echo "whatever-whatever-sco5"; exit 0
! 		;;
! 	    4.2MP)
! 		if [ "x$VERSION" = "x2.1.1" ]; then
! 		    echo "${MACHINE}-whatever-unixware211"; exit 0
! 		else
! 		    echo "${MACHINE}-whatever-unixware2"; exit 0
! 		fi
! 		;;
! 	    4.2)
! 		echo "whatever-whatever-unixware1"; exit 0
! 		;;
! 	esac
!     fi
  else
  # Now we simply scan though... In most cases, the SYSTEM info is enough
  #
*** src/Configure.orig	Sat Dec 28 02:09:09 1996
--- src/Configure	Mon Jan  6 22:41:15 1997
***************
*** 273,278 ****
--- 273,286 ----
  	LIBS="$LIBS -N128k -lsocket"
  	DEF_WANTHSREGEX=yes
  	;;
+     *-isc4*)
+ 	OS='ISC 4'
+ 	CC=gcc
+ 	CFLAGS="$CFLAGS -posix -DISC"
+ 	LFLAGS="$LFLAGS -posix"
+ 	LIBS="$LIBS -linet"
+         DEF_WANTHSREGEX=yes
+ 	;;
      *-sco3*)
  	OS='SCO 3'
  	CFLAGS="$CFLAGS -DSCO -Oacgiltz"
*** src/conf.h.orig	Sat Dec 28 02:09:09 1996
--- src/conf.h	Tue Jan  7 01:53:10 1997
***************
*** 419,424 ****
--- 419,434 ----
  #define FCNTL_SERIALIZED_ACCEPT
  #endif
  
+ #elif defined(ISC)
+ #include <net/errno.h>     
+ #define NO_KILLPG
+ #undef NO_SETSID
+ #define HAVE_SHMGET
+ #define SIGURG SIGUSR1
+ #define JMP_BUF sigjmp_buf
+ #define USE_FCNTL_SERIALIZED_ACCEPT
+ #define getwd(d) getcwd(d,MAX_STRING_LEN)
+ 
  /* Unknown system - Edit these to match */
  #else
  #ifdef BSD

-- 
Winfried Koenig, Arendsstrasse 12, D-63075 Offenbach
Phone: +49 69 868707,  Mail: <wi...@in.rhein-main.de>