ben 96/12/03 06:15:31
Modified: src Configure src/helpers GuessOS Log: Configuration fixes for Ultrix, IRIX64, Unixware. Submitted by: various Apache users Revision Changes Path 1.39 +14 -0 apache/src/Configure Index: Configure =================================================================== RCS file: /export/home/cvs/apache/src/Configure,v retrieving revision 1.38 retrieving revision 1.39 diff -C3 -r1.38 -r1.39 *** Configure 1996/12/03 01:06:11 1.38 --- Configure 1996/12/03 14:15:28 1.39 *************** *** 268,275 **** --- 268,289 ---- CFLAGS="$CFLAGS -DUXPDS" LIBS="$LIBS -lsocket -lnsl" ;; + *-ultrix) + OS='ULTRIX' + CFLAGS="-DULTRIX" + ;; *) # default: Catch systems we don't know about echo Sorry, but we cannot grok \"$PLAT\" + echo uname -m + uname -m + echo uname -r + uname -r + echo uname -s + uname -s + echo uname -v + uname -v + echo uname -X + uname -X echo Please Email this output to [EMAIL PROTECTED] echo Thank you exit 1 1.2 +12 -2 apache/src/helpers/GuessOS Index: GuessOS =================================================================== RCS file: /export/home/cvs/apache/src/helpers/GuessOS,v retrieving revision 1.1 retrieving revision 1.2 diff -C3 -r1.1 -r1.2 *** GuessOS 1996/10/23 12:56:34 1.1 --- GuessOS 1996/12/03 14:15:30 1.2 *************** *** 19,26 **** VERSION=`(uname -v) 2>/dev/null` || VERSION="unknown" ! # Now test for SCO, since it is has a unique uname option ! # that allows us to do a quick test # # We need to work around FreeBSD 1.1.5.1 SCO=`uname -X 2>/dev/null | grep "^Release" | cut -f3 -d' '` --- 19,25 ---- 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" | cut -f3 -d' '` *************** *** 32,37 **** --- 31,39 ---- 3\.2v5\.0\.0) echo "whatever-whatever-sco5"; exit 0 ;; + 4\.2MP) + echo "whatever-whatever-unixware2"; exit 0 + ;; esac else # Now we simply scan though... In most cases, the SYSTEM info is enough *************** *** 65,70 **** --- 67,76 ---- echo "${MACHINE}-sgi-irix"; exit 0 ;; + IRIX64:*) + echo "${MACHINE}-sgi-irix64"; exit 0 + ;; + Linux:*) echo "${MACHINE}-whatever-linux"; exit 0 ;; *************** *** 127,132 **** --- 133,142 ---- *:4.0:*:3[34]??,* | *:4.0:*:3[34]??,*) echo "${MACHINE}-whatever-sysv4"; exit 0 + ;; + + ULTRIX:*) + echo "${MACHINE}-unknown-ultrix"; exit 0 ;; esac