Received: (from majordom@localhost)
	by hyperreal.org (8.8.5/8.8.5) id LAA11347;
	Sun, 24 Aug 1997 11:24:08 -0700 (PDT)
Received: (from jim@localhost)
	by hyperreal.org (8.8.5/8.8.5) id LAA11341
	for apache-cvs; Sun, 24 Aug 1997 11:24:05 -0700 (PDT)
Date: Sun, 24 Aug 1997 11:24:05 -0700 (PDT)
From: Jim Jagielski <jim@hyperreal.org>
Message-Id: <199708241824.LAA11341@hyperreal.org>
To: apache-cvs@hyperreal.org
Subject: cvs commit: apachen/src/main conf.h
Sender: apache-cvs-owner@apache.org
Precedence: bulk
Reply-To: new-httpd@apache.org

jim         97/08/24 11:24:04

  Modified:    src      CHANGES Configure
               src/helpers GuessOS
               src/main conf.h
  Log:
  Two new ports: Acorn RISCiX and Encore UMAX V
  
  Revision  Changes    Path
  1.416     +4 -0      apachen/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/CHANGES,v
  retrieving revision 1.415
  retrieving revision 1.416
  diff -u -r1.415 -r1.416
  --- CHANGES	1997/08/24 12:44:29	1.415
  +++ CHANGES	1997/08/24 18:23:57	1.416
  @@ -1,5 +1,9 @@
   Changes with Apache 1.3a2
   
  +  *) PORT: 2 new OSs added to the list of ports:
  +      Encore's UMAX V: Arieh Markel <amarkel@encore.com>
  +      Acorn RISCiX: Stephen Borrill <sborrill@xemplar.co.uk>
  +
     *) Add the server version (SERVER_VERSION macro) to the "server
        configured and running" entry in the error_log.  Also build an
        object file at link-time that contains the current time
  
  
  
  1.140     +13 -0     apachen/src/Configure
  
  Index: Configure
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/Configure,v
  retrieving revision 1.139
  retrieving revision 1.140
  diff -u -r1.139 -r1.140
  --- Configure	1997/08/24 16:39:59	1.139
  +++ Configure	1997/08/24 18:23:58	1.140
  @@ -427,6 +427,12 @@
   	CFLAGS="$CFLAGS -DSVR4"
   	LIBS="$LIBS -lsocket -lnsl -lc"
   	;;
  +    88k-encore-sysv4)
  +	OS='Encore UMAX V'
  +	CFLAGS="$CFLAGS -DSVR4 -DENCORE"
  +	DEF_WANTHSREGEX=yes
  +	LIBS="$LIBS -lPW"
  +	;;
       *-uts*)
   	OS='Amdahl UTS'
   	CFLAGS="$CFLAGS -Xa -eft -DUTS21"
  @@ -468,6 +474,13 @@
   	DEF_WANTHSREGEX=yes
   	OS='SONY NEWS-OS'
   	CFLAGS="$CFLAGS -DNEWSOS"
  +	;;
  +    *-riscix)
  +	OS='Acorn RISCix'
  +	CFLAGS="$CFLAGS -DRISCIX"
  +	OPTIM="-O"
  +	MAKE="make"
  +	DEF_WANTHSREGEX=yes
   	;;
       *) # default: Catch systems we don't know about
       	echo Sorry, but we cannot grok \"$PLAT\"
  
  
  
  1.28      +8 -0      apachen/src/helpers/GuessOS
  
  Index: GuessOS
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/helpers/GuessOS,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- GuessOS	1997/07/21 23:09:31	1.27
  +++ GuessOS	1997/08/24 18:24:02	1.28
  @@ -167,6 +167,10 @@
   	echo "${MACHINE}-whatever-sysv4"; exit 0
   	;;
   
  +    unix:3.0.9*:*:88k)
  +	echo "${MACHINE}-encore-sysv4"; exit 0
  +	;;
  +
       *:4*:R4*:m88k)
   	echo "${MACHINE}-whatever-sysv4"; exit 0
   	;;
  @@ -205,6 +209,10 @@
       
       NonStop-UX:4.[02]*:[BC]*:*)
   	echo "${MACHINE}-tandem-sysv4"; exit 0;
  +	;;
  +
  +    "RISC iX":*)
  +	echo "arm-whatever-riscix"; exit 0;
   	;;
   
   esac
  
  
  
  1.128     +13 -1     apachen/src/main/conf.h
  
  Index: conf.h
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/main/conf.h,v
  retrieving revision 1.127
  retrieving revision 1.128
  diff -u -r1.127 -r1.128
  --- conf.h	1997/08/23 16:01:21	1.127
  +++ conf.h	1997/08/24 18:24:03	1.128
  @@ -361,7 +361,9 @@
   #undef  NO_SETSID
   #undef NEED_STRDUP
   #define NEED_STRCASECMP
  +#ifndef ENCORE
   #define NEED_STRNCASECMP
  +#endif
   #define bzero(a,b) memset(a,0,b)
   #define JMP_BUF sigjmp_buf
   /* A lot of SVR4 systems need this */
  @@ -565,6 +567,16 @@
   typedef int rlim_t;
   typedef int mode_t;
   
  +#elif defined(RISCIX)
  +#include <sys/time.h>
  +#define JMP_BUF jmp_buf
  +typedef int rlim_t;
  +#define NO_USE_SIGACTION
  +#define USE_LONGJMP
  +#define NEED_STRCASECMP
  +#define NEED_STRNCASECMP
  +#define NEED_STRDUP
  +
   #elif defined(WIN32)     
   /* Put your NT stuff here - Ambarish */
   
  @@ -846,7 +858,7 @@
    */
   
   #if defined(CRAY) || defined(__arm)
  -#if __STDC__
  +#ifdef __STDC__
   #define XtOffset(p_type,field) _Offsetof(p_type,field)
   #else
   #ifdef CRAY2