httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dgau...@hyperreal.org
Subject cvs commit: apachen/src/main conf.h
Date Sat, 25 Oct 1997 01:52:46 GMT
dgaudet     97/10/24 18:52:46

  Modified:    src      CHANGES Configure
               src/helpers GuessOS
               src/main conf.h
  Log:
  PORT: AIX now uses USE_FCNTL_SERIALIZED_ACCEPT. PR#849
  PORT: i386 AIX does not have memmove. PR#1267
  PORT: HPUX now defaults to using Spencer regex.  PR#482, 1246
  PORT: Some versions of netbsd don't automatically define
      __NetBSD__.  Workaround by defining NETBSD. PR#977
  PORT: Unixware 2.x requires -lgen for syslog. PR#1249
  PORT: Ultrix appears to not have syslog.
  PORT: Basic Gemini port (treat it like unixware212).
  PORT: All SVR4 systems now use NET_SIZE_T = size_t, and
      use HAVE_SHMGET.
  
  Submitted by:	various
  Reviewed by:	Dean Gaudet, Jim Jagielski, Martin Kraemer, Brian Behlendorf
  
  Revision  Changes    Path
  1.471     +12 -0     apachen/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/CHANGES,v
  retrieving revision 1.470
  retrieving revision 1.471
  diff -u -r1.470 -r1.471
  --- CHANGES	1997/10/22 08:26:50	1.470
  +++ CHANGES	1997/10/25 01:52:41	1.471
  @@ -1,5 +1,17 @@
   Changes with Apache 1.3b3
   
  +  *) PORT: AIX now uses USE_FCNTL_SERIALIZED_ACCEPT. PR#849
  +     PORT: i386 AIX does not have memmove. PR#1267
  +     PORT: HPUX now defaults to using Spencer regex.  PR#482, 1246
  +     PORT: Some versions of netbsd don't automatically define
  +	    __NetBSD__.  Workaround by defining NETBSD. PR#977
  +     PORT: Unixware 2.x requires -lgen for syslog. PR#1249
  +     PORT: Ultrix appears to not have syslog.
  +     PORT: Basic Gemini port (treat it like unixware212).
  +     PORT: All SVR4 systems now use NET_SIZE_T = size_t, and
  +	    use HAVE_SHMGET.
  +     [various]
  +
     *) Various improvements in detecting config file errors (missing closing
        directives for <Directory>, <Files> etc. blocks, prohibiting global
        server settings in <VirtualHost> blocks, flagging unhandled multiple
  
  
  
  1.163     +11 -8     apachen/src/Configure
  
  Index: Configure
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/Configure,v
  retrieving revision 1.162
  retrieving revision 1.163
  diff -u -r1.162 -r1.163
  --- Configure	1997/10/24 19:35:16	1.162
  +++ Configure	1997/10/25 01:52:42	1.163
  @@ -223,10 +223,12 @@
       *-hp-hpux10.*)
   	OS='HP-UX 10'
   	CFLAGS="$CFLAGS -DHPUX10"
  +	DEF_WANTHSREGEX=yes
   	;;
       *-hp-hpux*)
   	OS='HP-UX'
   	CFLAGS="$CFLAGS -DHPUX"
  +	DEF_WANTHSREGEX=yes
   	;;
       *-sgi-irix64)
   # Note: We'd like to see patches to compile 64-bit, but for now...
  @@ -304,14 +306,15 @@
   	DBM_LIB=""
   	DB_LIB=""
   	;;
  -    *486-*-freebsd*|*486-*-netbsd*)
  -	OS='FreeBSD/NETBSD on 486'
  +    *-netbsd*)
  +	OS='NetBSD'
  +	CFLAGS="$CFLAGS -DNETBSD"
   	LIBS="$LIBS -lcrypt"
   	DBM_LIB=""
   	DB_LIB=""
   	;;
  -    *-freebsd*|*-netbsd*)
  -	OS='FreeBSD/NetBSD'
  +    *-freebsd*)
  +	OS='FreeBSD'
   	LIBS="$LIBS -lcrypt"
   	DBM_LIB=""
   	DB_LIB=""
  @@ -398,17 +401,17 @@
   	DEF_WANTHSREGEX=yes
   	OS='Unixware'
   	CFLAGS="$CFLAGS -DSVR4 -DNO_LINGCLOSE"
  -	LIBS="$LIBS -lsocket -lnsl -lcrypt"
  +	LIBS="$LIBS -lsocket -lnsl -lcrypt -lgen"
   	;;
       *-unixware211)
   	OS='Unixware 2.1.1'
   	CFLAGS="$CFLAGS -DUW"
  -	LIBS="$LIBS -lsocket -lnsl -lcrypt"
  +	LIBS="$LIBS -lsocket -lnsl -lcrypt -lgen"
   	;;
       *-unixware212)
   	OS='Unixware 2.1.2'
   	CFLAGS="$CFLAGS -DUW"
  -	LIBS="$LIBS -lsocket -lnsl -lcrypt"
  +	LIBS="$LIBS -lsocket -lnsl -lcrypt -lgen"
   	DBM_LIB=""
   	;;
       maxion-*-sysv4*)
  @@ -419,7 +422,7 @@
   	;;
       *-sni-sysv4*)
   	OS='SVR4'
  -	CFLAGS="$CFLAGS -DSVR4 -D_XPG_IV -DHAVE_MMAP"
  +	CFLAGS="$CFLAGS -DSVR4 -D_XPG_IV"
   	DEF_WANTHSREGEX=yes
   	LIBS="$LIBS -lsocket -lnsl -lc"
   	;;
  
  
  
  1.32      +5 -0      apachen/src/helpers/GuessOS
  
  Index: GuessOS
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/helpers/GuessOS,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- GuessOS	1997/10/02 05:24:58	1.31
  +++ GuessOS	1997/10/25 01:52:44	1.32
  @@ -178,6 +178,11 @@
   	echo "${MACHINE}-whatever-sysv4"; exit 0
   	;;
   
  +    UnixWare:5:99*:*)
  +	# Gemini, beta release of next rev of unixware
  +	echo "${MACHINE}-whatever-unixware212"; exit 0
  +	;;
  +
       DYNIX/ptx:4*:*)
   	echo "${MACHINE}-whatever-sysv4"; exit 0
   	;;
  
  
  
  1.150     +6 -4      apachen/src/main/conf.h
  
  Index: conf.h
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/main/conf.h,v
  retrieving revision 1.149
  retrieving revision 1.150
  diff -u -r1.149 -r1.150
  --- conf.h	1997/10/22 20:29:34	1.149
  +++ conf.h	1997/10/25 01:52:45	1.150
  @@ -200,6 +200,10 @@
   #ifdef NEED_RLIM_T
   typedef int rlim_t;
   #endif
  +#define USE_FCNTL_SERIALIZED_ACCEPT
  +#ifdef USEBCOPY
  +#define memmove(a,b,c) bcopy(b,a,c)
  +#endif
   
   #elif defined(ULTRIX)
   #define HAVE_GMTOFF
  @@ -211,7 +215,6 @@
   #ifndef __ultrix__		/* Hack to check for pre-Ultrix 4.4 cc */
   #define const			/* Not implemented */
   #endif
  -#define HAVE_SYSLOG
   
   #elif defined(OSF1)
   #define HAVE_GMTOFF
  @@ -397,9 +400,8 @@
   /* A lot of SVR4 systems need this */
   #define USE_FCNTL_SERIALIZED_ACCEPT
   #define HAVE_SYSLOG
  -#ifdef SNI  /* SINIX/ReliantUNIX, probably other SVR4's as well */
   #define NET_SIZE_T size_t
  -#endif /*SNI*/
  +#define HAVE_SHMGET
   
   #elif defined(UW)
   #define NO_LINGCLOSE
  @@ -433,7 +435,7 @@
   #define ap_inet_addr inet_network
   #define HAVE_SYSLOG
   
  -#elif defined(__NetBSD__) || defined(__OpenBSD__)
  +#elif defined(__NetBSD__) || defined(__OpenBSD__) || defined(NETBSD)
   #define HAVE_SYS_RESOURCE_H
   #define HAVE_GMTOFF
   #undef NO_KILLPG
  
  
  

Mime
View raw message