jim 97/01/08 05:04:48
Modified: src Configure conf.h src/helpers GuessOS Log: Add several new platforms Revision Changes Path 1.66 +13 -0 apache/src/Configure Index: Configure =================================================================== RCS file: /export/home/cvs/apache/src/Configure,v retrieving revision 1.65 retrieving revision 1.66 diff -C3 -r1.65 -r1.66 *** Configure 1997/01/06 21:12:01 1.65 --- Configure 1997/01/08 13:04:45 1.66 *************** *** 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" *************** *** 349,354 **** --- 357,367 ---- CFLAGS="$CFLAGS -DCONVEXOS11" CC='cc' DEF_WANTHSREGEX=yes + ;; + i860-intel-osf1) + DEF_WANTHSREGEX=yes + OS='Paragon OSF/1' + CFLAGS="$CFLAGS -DPARAGON" ;; *) # default: Catch systems we don't know about echo Sorry, but we cannot grok \"$PLAT\" 1.66 +20 -0 apache/src/conf.h Index: conf.h =================================================================== RCS file: /export/home/cvs/apache/src/conf.h,v retrieving revision 1.65 retrieving revision 1.66 diff -C3 -r1.65 -r1.66 *** conf.h 1997/01/06 21:12:02 1.65 --- conf.h 1997/01/08 13:04:45 1.66 *************** *** 144,149 **** --- 144,159 ---- #define HAVE_CRYPT_H #define NO_LONG_DOUBLE + #elif defined(PARAGON) + #define HAVE_GMTOFF + #undef NO_KILLPG + #undef NO_SETSID + #define JMP_BUF sigjmp_buf + #define HAVE_MMAP + #define HAVE_CRYPT_H + #define NO_LONG_DOUBLE + typedef int rlim_t; + #elif defined(SEQUENT) #define HAVE_GMTOFF #undef NO_KILLPG *************** *** 426,431 **** --- 436,451 ---- #include <sys/types.h> #define JMB_BUF jmp_buf typedef int rlim_t; + + #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 1.14 +33 -21 apache/src/helpers/GuessOS Index: GuessOS =================================================================== RCS file: /export/home/cvs/apache/src/helpers/GuessOS,v retrieving revision 1.13 retrieving revision 1.14 diff -C3 -r1.13 -r1.14 *** GuessOS 1997/01/06 21:12:05 1.13 --- GuessOS 1997/01/08 13:04:48 1.14 *************** *** 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 # *************** *** 126,131 **** --- 134,143 ---- exit 0 ;; + Paragon*:*:*:*) + echo "i860-intel-osf1"; exit 0 + ;; + SunOS:5.*) echo "${MACHINE}-sun-solaris2"; exit 0 ;;