cvs commit: apache/src/helpers GuessOS
jim 97/07/21 16:09:31
Modified:src Configure
src/helpers GuessOS
Log:
Nicer solution to the Solaris version "problem". We now set SOLARIS
to the actual version number in Configure, thanks to extra info
from GuessOS.
Revision ChangesPath
1.119 +11 -17apache/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.118
retrieving revision 1.119
diff -C3 -r1.118 -r1.119
*** Configure 1997/07/21 20:06:34 1.118
--- Configure 1997/07/21 23:09:30 1.119
***
*** 386,411
LIBS="$LIBS -lsocket -lmalloc -lprot"
DEF_WANTHSREGEX=no
;;
- *-solaris2.[0123]*)
- OS='Solaris 2.[0123]'
- CFLAGS="$CFLAGS -DSOLARIS2 -DSOLARIS_PRE24"
- LIBS="$LIBS -lsocket -lnsl"
- DBM_LIB=""
- DEF_WANTHSREGEX=yes
- ;;
- *-solaris2.[45]*)
- OS='Solaris 2.[45]'
- CFLAGS="$CFLAGS -DSOLARIS2 -DSOLARIS_PRE26"
- LIBS="$LIBS -lsocket -lnsl"
- DBM_LIB=""
- DEF_WANTHSREGEX=no
- ;;
*-solaris2*)
! OS='Solaris 2'
! CFLAGS="$CFLAGS -DSOLARIS2"
LIBS="$LIBS -lsocket -lnsl"
DBM_LIB=""
! DEF_WANTHSREGEX=no
;;
*-sunos4*)
OS='SunOS 4'
--- 386,405
LIBS="$LIBS -lsocket -lmalloc -lprot"
DEF_WANTHSREGEX=no
;;
*-solaris2*)
! SOLVER=`echo $PLAT | sed -e 's/^.*solaris2.//'`
! OS="Solaris $SOLVER"
! CFLAGS="$CFLAGS -DSOLARIS2=$SOLVER"
LIBS="$LIBS -lsocket -lnsl"
DBM_LIB=""
! case "$SOLVER" in
! 2[0123]*)
! DEF_WANTHSREGEX=yes
! ;;
! *)
! DEF_WANTHSREGEX=no
! ;;
! esac
;;
*-sunos4*)
OS='SunOS 4'
1.27 +6 -1 apache/src/helpers/GuessOS
Index: GuessOS
===
RCS file: /export/home/cvs/apache/src/helpers/GuessOS,v
retrieving revision 1.26
retrieving revision 1.27
diff -C3 -r1.26 -r1.27
*** GuessOS 1997/07/21 20:06:35 1.26
--- GuessOS 1997/07/21 23:09:31 1.27
***
*** 150,156
;;
SunOS:5.*)
! SOLVER=`echo ${RELEASE}|sed -e 's/^5.//'`
echo "${MACHINE}-sun-solaris2.${SOLVER}"; exit 0
;;
--- 150,161
;;
SunOS:5.*)
! SOLVER=`echo ${RELEASE}|awk -F. '{
! if (NF < 3)
! printf "2%s0\n",$2
! else
! printf "2%s%s\n",$2,$3
! }'`
echo "${MACHINE}-sun-solaris2.${SOLVER}"; exit 0
;;
cvs commit: apache/src/helpers GuessOS
jim 97/07/21 13:06:37
Modified:src Configure
src/helpers GuessOS
Log:
Per Roy's request, Configure/GuessOS now knows about Solaris versions
Revision ChangesPath
1.118 +15 -1 apache/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.117
retrieving revision 1.118
diff -C3 -r1.117 -r1.118
*** Configure 1997/07/21 17:51:29 1.117
--- Configure 1997/07/21 20:06:34 1.118
***
*** 386,397
LIBS="$LIBS -lsocket -lmalloc -lprot"
DEF_WANTHSREGEX=no
;;
*-solaris2*)
OS='Solaris 2'
CFLAGS="$CFLAGS -DSOLARIS2"
LIBS="$LIBS -lsocket -lnsl"
DBM_LIB=""
! DEF_WANTHSREGEX=yes
;;
*-sunos4*)
OS='SunOS 4'
--- 386,411
LIBS="$LIBS -lsocket -lmalloc -lprot"
DEF_WANTHSREGEX=no
;;
+ *-solaris2.[0123]*)
+ OS='Solaris 2.[0123]'
+ CFLAGS="$CFLAGS -DSOLARIS2 -DSOLARIS_PRE24"
+ LIBS="$LIBS -lsocket -lnsl"
+ DBM_LIB=""
+ DEF_WANTHSREGEX=yes
+ ;;
+ *-solaris2.[45]*)
+ OS='Solaris 2.[45]'
+ CFLAGS="$CFLAGS -DSOLARIS2 -DSOLARIS_PRE26"
+ LIBS="$LIBS -lsocket -lnsl"
+ DBM_LIB=""
+ DEF_WANTHSREGEX=no
+ ;;
*-solaris2*)
OS='Solaris 2'
CFLAGS="$CFLAGS -DSOLARIS2"
LIBS="$LIBS -lsocket -lnsl"
DBM_LIB=""
! DEF_WANTHSREGEX=no
;;
*-sunos4*)
OS='SunOS 4'
1.26 +3 -9 apache/src/helpers/GuessOS
Index: GuessOS
===
RCS file: /export/home/cvs/apache/src/helpers/GuessOS,v
retrieving revision 1.25
retrieving revision 1.26
diff -C3 -r1.25 -r1.26
*** GuessOS 1997/07/21 12:27:19 1.25
--- GuessOS 1997/07/21 20:06:35 1.26
***
*** 74,87
HP-UX:*)
HPUXVER=`echo ${RELEASE}|sed -e 's/[^.]*.[0B]*//'`
! case "$HPUXVER" in
! 10.*)
! echo "${MACHINE}-hp-hpux10."; exit 0
! ;;
! *)
! echo "${MACHINE}-hp-hpux"; exit 0
! ;;
! esac
;;
IRIX:*)
--- 74,80
HP-UX:*)
HPUXVER=`echo ${RELEASE}|sed -e 's/[^.]*.[0B]*//'`
! echo "${MACHINE}-hp-hpux${HPUXVER}"; exit 0
;;
IRIX:*)
***
*** 157,163
;;
SunOS:5.*)
! echo "${MACHINE}-sun-solaris2"; exit 0
;;
SunOS:*)
--- 150,157
;;
SunOS:5.*)
! SOLVER=`echo ${RELEASE}|sed -e 's/^5.//'`
! echo "${MACHINE}-sun-solaris2.${SOLVER}"; exit 0
;;
SunOS:*)
cvs commit: apache/src/helpers GuessOS
jim 97/07/21 05:27:19
Modified:src CHANGES Configure util_snprintf.c
src/helpers GuessOS
Log:
Closeout PR#721: Allow for automatic use of n32 bit libraries under
IRIX 6
Revision ChangesPath
1.358 +3 -0 apache/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.357
retrieving revision 1.358
diff -C3 -r1.357 -r1.358
*** CHANGES 1997/07/21 03:37:47 1.357
--- CHANGES 1997/07/21 12:27:15 1.358
***
*** 1,5
--- 1,8
Changes with Apache 1.3
+ *) PORT: Allow for use of n32bit libraries under IRIX 6.x
+ [derived from patch from Jeff Hayes <[EMAIL PROTECTED]>]
+
*) PORT: Some architectures use size_t for various lengths in network
functions such as accept(), and getsockname(). The definition
NET_SIZE_T is used to control this. [Dean Gaudet]
1.116 +12 -0 apache/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.115
retrieving revision 1.116
diff -C3 -r1.115 -r1.116
*** Configure 1997/07/21 03:42:11 1.115
--- Configure 1997/07/21 12:27:16 1.116
***
*** 267,272
--- 267,284
CFLAGS="$CFLAGS -DIRIX"
fi
;;
+ *-sgi-irix32)
+ CFLAGS="$CFLAGS -n32"
+ LDFLAGS="$LDFLAGS -n32"
+ DEF_WANTHSREGEX=yes
+ DBM_LIB=""
+ CFLAGS="$CFLAGS -DIRIX"
+ if [ "$RULE_IRIXNIS" = "yes" ]; then
+ OS='SGI IRIX-32 w/NIS'
+ else
+ OS='SGI IRIX-32'
+ fi
+ ;;
*-sgi-irix)
DEF_WANTHSREGEX=yes
DBM_LIB=""
1.8 +1 -1 apache/src/util_snprintf.c
Index: util_snprintf.c
===
RCS file: /export/home/cvs/apache/src/util_snprintf.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C3 -r1.7 -r1.8
*** util_snprintf.c 1997/07/16 00:41:22 1.7
--- util_snprintf.c 1997/07/21 12:27:16 1.8
***
*** 184,190
{
int sign, decpt;
register char *p1, *p2;
! register i;
p1 = ap_ecvt(number, ndigit, &decpt, &sign);
p2 = buf;
--- 184,190
{
int sign, decpt;
register char *p1, *p2;
! register int i;
p1 = ap_ecvt(number, ndigit, &decpt, &sign);
p2 = buf;
1.25 +5 -1 apache/src/helpers/GuessOS
Index: GuessOS
===
RCS file: /export/home/cvs/apache/src/helpers/GuessOS,v
retrieving revision 1.24
retrieving revision 1.25
diff -C3 -r1.24 -r1.25
*** GuessOS 1997/07/01 01:15:30 1.24
--- GuessOS 1997/07/21 12:27:19 1.25
***
*** 85,91
;;
IRIX:*)
! echo "${MACHINE}-sgi-irix"; exit 0
;;
IRIX64:*)
--- 85,95
;;
IRIX:*)
! if [ -f /usr/lib32/mips4/libm.so ]; then
! echo "${MACHINE}-sgi-irix32"; exit 0
! else
! echo "${MACHINE}-sgi-irix"; exit 0
! fi
;;
IRIX64:*)
cvs commit: apache/src/helpers GuessOS
dgaudet 97/06/30 18:38:17
Modified:src Tag: APACHE_1_2_X CHANGES Configure conf.h
src/helpers Tag: APACHE_1_2_X GuessOS
Log:
PR#333: Fix rlim_t problems with AIX 4.2.
Submitted by: Marc Slemko
Reviewed by: Dean Gaudet
Revision ChangesPath
No revision
No revision
1.286.2.24 +2 -0 apache/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.286.2.23
retrieving revision 1.286.2.24
diff -C3 -r1.286.2.23 -r1.286.2.24
*** CHANGES 1997/07/01 01:37:07 1.286.2.23
--- CHANGES 1997/07/01 01:38:12 1.286.2.24
***
*** 82,87
--- 82,89
*) pregsub had an off-by-1 in its error checking code. [Alexei Kosut]
+ *) PORT: fix rlim_t problems with AIX 4.2. [Marc Slemko] PR#333
+
*) PORT: Update Unixware support for 2.1.2.
[Lawrence Rosenman ] PR#511
1.96.2.7 +7 -3 apache/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.96.2.6
retrieving revision 1.96.2.7
diff -C3 -r1.96.2.6 -r1.96.2.7
*** Configure 1997/06/29 18:28:24 1.96.2.6
--- Configure 1997/07/01 01:38:13 1.96.2.7
***
*** 205,214
CFLAGS="$CFLAGS -DAIX -U__STR__ -DUSEBCOPY"
DEF_WANTHSREGEX=no
;;
*-ibm-aix*)
! OS='IBM AIX'
! CFLAGS="$CFLAGS -DAIX -U__STR__"
! ;;
*-apollo-*)
OS='Apollo Domain'
CFLAGS="$CFLAGS -DAPOLLO"
--- 205,218
CFLAGS="$CFLAGS -DAIX -U__STR__ -DUSEBCOPY"
DEF_WANTHSREGEX=no
;;
+ *-ibm-aix[1-3].*|*-ibm-aix4.[0-1])
+ OS='IBM AIX < v4.2'
+ CFLAGS="$CFLAGS -DAIX -DNEED_RLIM_T -U__STR__"
+ ;;
*-ibm-aix*)
! OS='IBM AIX >= 4.2'
! CFLAGS="$CFLAGS -DAIX -U__STR__"
! ;;
*-apollo-*)
OS='Apollo Domain'
CFLAGS="$CFLAGS -DAPOLLO"
1.99.2.4 +2 -0 apache/src/conf.h
Index: conf.h
===
RCS file: /export/home/cvs/apache/src/conf.h,v
retrieving revision 1.99.2.3
retrieving revision 1.99.2.4
diff -C3 -r1.99.2.3 -r1.99.2.4
*** conf.h1997/06/29 18:08:35 1.99.2.3
--- conf.h1997/07/01 01:38:13 1.99.2.4
***
*** 155,161
--- 155,163
#define DEFAULT_GROUP "nobody"
#endif
#define DEFAULT_USER "nobody"
+ #ifdef NEED_RLIM_T
typedef int rlim_t;
+ #endif
#elif defined(ULTRIX)
#define HAVE_GMTOFF
No revision
No revision
1.19.2.5 +1 -1 apache/src/helpers/GuessOS
Index: GuessOS
===
RCS file: /export/home/cvs/apache/src/helpers/GuessOS,v
retrieving revision 1.19.2.4
retrieving revision 1.19.2.5
diff -C3 -r1.19.2.4 -r1.19.2.5
*** GuessOS 1997/06/27 02:02:01 1.19.2.4
--- GuessOS 1997/07/01 01:38:16 1.19.2.5
***
*** 61,67
;;
AIX:*)
! echo "${MACHINE}-ibm-aix"; exit 0
;;
dgux:*)
--- 61,67
;;
AIX:*)
! echo "${MACHINE}-ibm-aix${VERSION}.${RELEASE}"; exit 0
;;
dgux:*)
cvs commit: apache/src/helpers GuessOS
dgaudet 97/06/30 18:15:30
Modified:src CHANGES Configure conf.h
src/helpers GuessOS
Log:
PR#333: Fix rlim_t problems with AIX 4.2.
Submitted by: Marc Slemko
Reviewed by: Dean Gaudet
Revision ChangesPath
1.318 +2 -0 apache/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.317
retrieving revision 1.318
diff -C3 -r1.317 -r1.318
*** CHANGES 1997/07/01 01:13:40 1.317
--- CHANGES 1997/07/01 01:15:26 1.318
***
*** 145,150
--- 145,152
*) pregsub had an off-by-1 in its error checking code. [Alexei Kosut]
+ *) PORT: fix rlim_t problems with AIX 4.2. [Marc Slemko] PR#333
+
*) PORT: Update Unixware support for 2.1.2.
[Lawrence Rosenman ] PR#511
1.104 +7 -3 apache/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.103
retrieving revision 1.104
diff -C3 -r1.103 -r1.104
*** Configure 1997/06/30 21:42:30 1.103
--- Configure 1997/07/01 01:15:27 1.104
***
*** 205,214
CFLAGS="$CFLAGS -DAIX -U__STR__ -DUSEBCOPY"
DEF_WANTHSREGEX=no
;;
*-ibm-aix*)
! OS='IBM AIX'
! CFLAGS="$CFLAGS -DAIX -U__STR__"
! ;;
*-apollo-*)
OS='Apollo Domain'
CFLAGS="$CFLAGS -DAPOLLO"
--- 205,218
CFLAGS="$CFLAGS -DAIX -U__STR__ -DUSEBCOPY"
DEF_WANTHSREGEX=no
;;
+ *-ibm-aix[1-3].*|*-ibm-aix4.[0-1])
+ OS='IBM AIX < v4.2'
+ CFLAGS="$CFLAGS -DAIX -DNEED_RLIM_T -U__STR__"
+ ;;
*-ibm-aix*)
! OS='IBM AIX >= 4.2'
! CFLAGS="$CFLAGS -DAIX -U__STR__"
! ;;
*-apollo-*)
OS='Apollo Domain'
CFLAGS="$CFLAGS -DAPOLLO"
1.109 +2 -0 apache/src/conf.h
Index: conf.h
===
RCS file: /export/home/cvs/apache/src/conf.h,v
retrieving revision 1.108
retrieving revision 1.109
diff -C3 -r1.108 -r1.109
*** conf.h1997/06/30 21:03:17 1.108
--- conf.h1997/07/01 01:15:27 1.109
***
*** 155,161
--- 155,163
#define DEFAULT_GROUP "nobody"
#endif
#define DEFAULT_USER "nobody"
+ #ifdef NEED_RLIM_T
typedef int rlim_t;
+ #endif
#elif defined(ULTRIX)
#define HAVE_GMTOFF
1.24 +1 -1 apache/src/helpers/GuessOS
Index: GuessOS
===
RCS file: /export/home/cvs/apache/src/helpers/GuessOS,v
retrieving revision 1.23
retrieving revision 1.24
diff -C3 -r1.23 -r1.24
*** GuessOS 1997/06/24 01:10:58 1.23
--- GuessOS 1997/07/01 01:15:30 1.24
***
*** 61,67
;;
AIX:*)
! echo "${MACHINE}-ibm-aix"; exit 0
;;
dgux:*)
--- 61,67
;;
AIX:*)
! echo "${MACHINE}-ibm-aix${VERSION}.${RELEASE}"; exit 0
;;
dgux:*)
cvs commit: apache/src/helpers GuessOS
dgaudet 97/06/26 19:02:02
Modified:src Tag: APACHE_1_2_X Configure CHANGES
src/helpers Tag: APACHE_1_2_X GuessOS
Log:
PR#511: update unixware support for 2.1.2
Submitted by: Lawrence Rosenman
Revision ChangesPath
No revision
No revision
1.96.2.5 +6 -0 apache/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.96.2.4
retrieving revision 1.96.2.5
diff -C3 -r1.96.2.4 -r1.96.2.5
*** Configure 1997/06/27 02:01:03 1.96.2.4
--- Configure 1997/06/27 02:01:57 1.96.2.5
***
*** 403,408
--- 403,414
CFLAGS="$CFLAGS -DUW"
LIBS="$LIBS -lsocket -lnsl -lcrypt"
;;
+ *-unixware212)
+ OS='Unixware 2.1.2'
+ CFLAGS="$CFLAGS -DUW"
+ LIBS="$LIBS -lsocket -lnsl -lcrypt"
+ DBM_LIB=""
+ ;;
maxion-*-sysv4*)
OS='SVR4'
CFLAGS="$CFLAGS -DSVR4"
1.286.2.8 +3 -0 apache/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.286.2.7
retrieving revision 1.286.2.8
diff -C3 -r1.286.2.7 -r1.286.2.8
*** CHANGES 1997/06/27 02:01:04 1.286.2.7
--- CHANGES 1997/06/27 02:01:58 1.286.2.8
***
*** 1,5
--- 1,8
Changes with Apache 1.2.1
+ *) Update Unixware support for 2.1.2. [Lawrence Rosenman
]
+ PR#511
+
*) Port to NonStop-UX [Joachim Schmitz <[EMAIL PROTECTED]>] PR#327
*) Update ConvexOS support for 11.5. [David DeSimone <[EMAIL PROTECTED]>]
No revision
No revision
1.19.2.4 +2 -0 apache/src/helpers/GuessOS
Index: GuessOS
===
RCS file: /export/home/cvs/apache/src/helpers/GuessOS,v
retrieving revision 1.19.2.3
retrieving revision 1.19.2.4
diff -C3 -r1.19.2.3 -r1.19.2.4
*** GuessOS 1997/06/27 02:01:07 1.19.2.3
--- GuessOS 1997/06/27 02:02:01 1.19.2.4
***
*** 41,46
--- 41,48
4.2MP)
if [ "x$VERSION" = "x2.1.1" ]; then
echo "${MACHINE}-whatever-unixware211"; exit 0
+ elif [ "x$VERSION" = "x2.1.2" ]; then
+ echo "${MACHINE}-whatever-unixware212"; exit 0
else
echo "${MACHINE}-whatever-unixware2"; exit 0
fi
cvs commit: apache/src/helpers GuessOS
dgaudet 97/06/26 19:01:08
Modified:src Tag: APACHE_1_2_X Configure CHANGES
src/helpers Tag: APACHE_1_2_X GuessOS
Log:
PR#327: Port to NonStop-UX
Submitted by: Joachim Schmitz <[EMAIL PROTECTED]>
Revision ChangesPath
No revision
No revision
1.96.2.4 +6 -0 apache/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.96.2.3
retrieving revision 1.96.2.4
diff -C3 -r1.96.2.3 -r1.96.2.4
*** Configure 1997/06/27 01:58:15 1.96.2.3
--- Configure 1997/06/27 02:01:03 1.96.2.4
***
*** 421,426
--- 421,432
LIBS="$LIBS -lsocket -lnsl"
DEF_WANTHSREGEX=yes
;;
+ *-tandem-sysv4*)
+ OS='SVR4'
+ CFLAGS="$CFLAGS -DSVR4"
+ LIBS="$LIBS -lsocket -lnsl"
+ DEF_WANTHSREGEX=yes
+ ;;
*-sysv4*)
OS='SVR4'
CFLAGS="$CFLAGS -DSVR4"
1.286.2.7 +2 -0 apache/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.286.2.6
retrieving revision 1.286.2.7
diff -C3 -r1.286.2.6 -r1.286.2.7
*** CHANGES 1997/06/27 01:59:29 1.286.2.6
--- CHANGES 1997/06/27 02:01:04 1.286.2.7
***
*** 1,5
--- 1,7
Changes with Apache 1.2.1
+ *) Port to NonStop-UX [Joachim Schmitz <[EMAIL PROTECTED]>] PR#327
+
*) Update ConvexOS support for 11.5. [David DeSimone <[EMAIL PROTECTED]>]
PR#399
No revision
No revision
1.19.2.3 +4 -0 apache/src/helpers/GuessOS
Index: GuessOS
===
RCS file: /export/home/cvs/apache/src/helpers/GuessOS,v
retrieving revision 1.19.2.2
retrieving revision 1.19.2.3
diff -C3 -r1.19.2.2 -r1.19.2.3
*** GuessOS 1997/06/27 01:59:31 1.19.2.2
--- GuessOS 1997/06/27 02:01:07 1.19.2.3
***
*** 197,202
--- 197,206
UNIX_SV:*:*:maxion)
echo "${MACHINE}-ccur-sysv4"; exit 0;
;;
+
+ NonStop-UX:4.[02]*:[BC]*:*)
+ echo "${MACHINE}-tandem-sysv4"; exit 0;
+ ;;
esac
cvs commit: apache/src/helpers GuessOS
dgaudet 97/06/26 18:59:32
Modified:src Tag: APACHE_1_2_X CHANGES
src/helpers Tag: APACHE_1_2_X GuessOS
Log:
PR#399: Update Convex support for 11.5
Revision ChangesPath
No revision
No revision
1.286.2.6 +3 -0 apache/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.286.2.5
retrieving revision 1.286.2.6
diff -C3 -r1.286.2.5 -r1.286.2.6
*** CHANGES 1997/06/27 01:58:16 1.286.2.5
--- CHANGES 1997/06/27 01:59:29 1.286.2.6
***
*** 1,5
--- 1,8
Changes with Apache 1.2.1
+ *) Update ConvexOS support for 11.5. [David DeSimone <[EMAIL PROTECTED]>]
+ PR#399
+
*) Support for dec cc compiler under ultrix.
["P. Alejandro Lopez-Valencia" <[EMAIL PROTECTED]>] PR#388
No revision
No revision
1.19.2.2 +1 -1 apache/src/helpers/GuessOS
Index: GuessOS
===
RCS file: /export/home/cvs/apache/src/helpers/GuessOS,v
retrieving revision 1.19.2.1
retrieving revision 1.19.2.2
diff -C3 -r1.19.2.1 -r1.19.2.2
*** GuessOS 1997/06/27 01:55:31 1.19.2.1
--- GuessOS 1997/06/27 01:59:31 1.19.2.2
***
*** 190,196
echo "${MACHINE}-ncr-sysv4"; exit 0
;;
! ConvexOS:*:11.0:*)
echo "${MACHINE}-v11-${SYSTEM}"; exit 0;
;;
--- 190,196
echo "${MACHINE}-ncr-sysv4"; exit 0
;;
! ConvexOS:*:11.*:*)
echo "${MACHINE}-v11-${SYSTEM}"; exit 0;
;;
cvs commit: apache/src/helpers GuessOS
dgaudet 97/06/26 18:55:32
Modified:src Tag: APACHE_1_2_X Configure
src/helpers Tag: APACHE_1_2_X GuessOS
Log:
PR#383: Support for Maxion/OS SVR4.2 Real Time Unix
Submitted by: no email address given
Revision ChangesPath
No revision
No revision
1.96.2.2 +6 -0 apache/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.96.2.1
retrieving revision 1.96.2.2
diff -C3 -r1.96.2.1 -r1.96.2.2
*** Configure 1997/06/27 01:39:12 1.96.2.1
--- Configure 1997/06/27 01:55:30 1.96.2.2
***
*** 403,408
--- 403,414
CFLAGS="$CFLAGS -DUW"
LIBS="$LIBS -lsocket -lnsl -lcrypt"
;;
+ maxion-*-sysv4*)
+ OS='SVR4'
+ CFLAGS="$CFLAGS -DSVR4"
+ DEF_WANTHSREGEX=yes
+ LIBS="$LIBS -lsocket -lnsl -lc -lgen"
+ ;;
*-sni-sysv4*)
OS='SVR4'
CFLAGS="$CFLAGS -DSVR4"
No revision
No revision
1.19.2.1 +4 -0 apache/src/helpers/GuessOS
Index: GuessOS
===
RCS file: /export/home/cvs/apache/src/helpers/GuessOS,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -C3 -r1.19 -r1.19.2.1
*** GuessOS 1997/04/27 07:52:19 1.19
--- GuessOS 1997/06/27 01:55:31 1.19.2.1
***
*** 193,198
--- 193,202
ConvexOS:*:11.0:*)
echo "${MACHINE}-v11-${SYSTEM}"; exit 0;
;;
+
+ UNIX_SV:*:*:maxion)
+ echo "${MACHINE}-ccur-sysv4"; exit 0;
+ ;;
esac
cvs commit: apache/src/helpers GuessOS
dgaudet 97/06/23 18:10:59
Modified:src Configure CHANGES
src/helpers GuessOS
Log:
PR#511: update unixware support for 2.1.2
Submitted by: Lawrence Rosenman
Revision ChangesPath
1.101 +6 -0 apache/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.100
retrieving revision 1.101
diff -C3 -r1.100 -r1.101
*** Configure 1997/06/24 01:06:02 1.100
--- Configure 1997/06/24 01:10:55 1.101
***
*** 403,408
--- 403,414
CFLAGS="$CFLAGS -DUW"
LIBS="$LIBS -lsocket -lnsl -lcrypt"
;;
+ *-unixware212)
+ OS='Unixware 2.1.2'
+ CFLAGS="$CFLAGS -DUW"
+ LIBS="$LIBS -lsocket -lnsl -lcrypt"
+ DBM_LIB=""
+ ;;
maxion-*-sysv4*)
OS='SVR4'
CFLAGS="$CFLAGS -DSVR4"
1.295 +3 -0 apache/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.294
retrieving revision 1.295
diff -C3 -r1.294 -r1.295
*** CHANGES 1997/06/24 01:06:03 1.294
--- CHANGES 1997/06/24 01:10:56 1.295
***
*** 7,12
--- 7,15
*) Added NT support [Ben Laurie and Ambarish Malpani <[EMAIL PROTECTED]>]
Changes with Apache 1.2.1
+
+ *) Update Unixware support for 2.1.2. [Lawrence Rosenman
]
+ PR#511
*) Port to NonStop-UX [Joachim Schmitz <[EMAIL PROTECTED]>] PR#327
1.23 +2 -0 apache/src/helpers/GuessOS
Index: GuessOS
===
RCS file: /export/home/cvs/apache/src/helpers/GuessOS,v
retrieving revision 1.22
retrieving revision 1.23
diff -C3 -r1.22 -r1.23
*** GuessOS 1997/06/24 01:06:05 1.22
--- GuessOS 1997/06/24 01:10:58 1.23
***
*** 41,46
--- 41,48
4.2MP)
if [ "x$VERSION" = "x2.1.1" ]; then
echo "${MACHINE}-whatever-unixware211"; exit 0
+ elif [ "x$VERSION" = "x2.1.2" ]; then
+ echo "${MACHINE}-whatever-unixware212"; exit 0
else
echo "${MACHINE}-whatever-unixware2"; exit 0
fi
cvs commit: apache/src/helpers GuessOS
dgaudet 97/06/23 18:06:06
Modified:src Configure CHANGES
src/helpers GuessOS
Log:
PR#327: Port to NonStop-UX
Submitted by: Joachim Schmitz <[EMAIL PROTECTED]>
Revision ChangesPath
1.100 +6 -0 apache/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.99
retrieving revision 1.100
diff -C3 -r1.99 -r1.100
*** Configure 1997/06/24 00:51:53 1.99
--- Configure 1997/06/24 01:06:02 1.100
***
*** 421,426
--- 421,432
LIBS="$LIBS -lsocket -lnsl"
DEF_WANTHSREGEX=yes
;;
+ *-tandem-sysv4*)
+ OS='SVR4'
+ CFLAGS="$CFLAGS -DSVR4"
+ LIBS="$LIBS -lsocket -lnsl"
+ DEF_WANTHSREGEX=yes
+ ;;
*-sysv4*)
OS='SVR4'
CFLAGS="$CFLAGS -DSVR4"
1.294 +2 -0 apache/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.293
retrieving revision 1.294
diff -C3 -r1.293 -r1.294
*** CHANGES 1997/06/24 00:59:00 1.293
--- CHANGES 1997/06/24 01:06:03 1.294
***
*** 8,13
--- 8,15
Changes with Apache 1.2.1
+ *) Port to NonStop-UX [Joachim Schmitz <[EMAIL PROTECTED]>] PR#327
+
*) Update ConvexOS support for 11.5. [David DeSimone <[EMAIL PROTECTED]>]
PR#399
1.22 +4 -0 apache/src/helpers/GuessOS
Index: GuessOS
===
RCS file: /export/home/cvs/apache/src/helpers/GuessOS,v
retrieving revision 1.21
retrieving revision 1.22
diff -C3 -r1.21 -r1.22
*** GuessOS 1997/06/24 00:58:59 1.21
--- GuessOS 1997/06/24 01:06:05 1.22
***
*** 197,202
--- 197,206
UNIX_SV:*:*:maxion)
echo "${MACHINE}-ccur-sysv4"; exit 0;
;;
+
+ NonStop-UX:4.[02]*:[BC]*:*)
+ echo "${MACHINE}-tandem-sysv4"; exit 0;
+ ;;
esac
cvs commit: apache/src/helpers GuessOS
dgaudet 97/06/23 17:46:12
Modified:src Configure
src/helpers GuessOS
Log:
PR#383: Support for Maxion/OS SVR4.2 Real Time Unix
Submitted by: no email address given
Revision ChangesPath
1.98 +6 -0 apache/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.97
retrieving revision 1.98
diff -C3 -r1.97 -r1.98
*** Configure 1997/06/24 00:14:06 1.97
--- Configure 1997/06/24 00:46:11 1.98
***
*** 403,408
--- 403,414
CFLAGS="$CFLAGS -DUW"
LIBS="$LIBS -lsocket -lnsl -lcrypt"
;;
+ maxion-*-sysv4*)
+ OS='SVR4'
+ CFLAGS="$CFLAGS -DSVR4"
+ DEF_WANTHSREGEX=yes
+ LIBS="$LIBS -lsocket -lnsl -lc -lgen"
+ ;;
*-sni-sysv4*)
OS='SVR4'
CFLAGS="$CFLAGS -DSVR4"
1.20 +4 -0 apache/src/helpers/GuessOS
Index: GuessOS
===
RCS file: /export/home/cvs/apache/src/helpers/GuessOS,v
retrieving revision 1.19
retrieving revision 1.20
diff -C3 -r1.19 -r1.20
*** GuessOS 1997/04/27 07:52:19 1.19
--- GuessOS 1997/06/24 00:46:12 1.20
***
*** 193,198
--- 193,202
ConvexOS:*:11.0:*)
echo "${MACHINE}-v11-${SYSTEM}"; exit 0;
;;
+
+ UNIX_SV:*:*:maxion)
+ echo "${MACHINE}-ccur-sysv4"; exit 0;
+ ;;
esac
cvs commit: apache/src/helpers GuessOS
dgaudet 97/04/27 00:52:20 Modified:htdocs/manual/mod core.html src CHANGES Configuration.tmpl Configure conf.h src/helpers GuessOS Log: Clean up Linux configuration by detecting 2.x linux and enabling HAVE_SHMGET, and HAVE_SYS_RESOURCE_H. Don't touch Linux 1.x systems for fear of various compatibility problems. Ditch that silly hack LINUX_TWEAK that I wish I hadn't introduced. Reviewed by: Paul S., Roy Revision ChangesPath 1.53 +7 -6 apache/htdocs/manual/mod/core.html Index: core.html === RCS file: /export/home/cvs/apache/htdocs/manual/mod/core.html,v retrieving revision 1.52 retrieving revision 1.53 diff -C3 -r1.52 -r1.53 *** core.html 1997/04/25 20:49:04 1.52 --- core.html 1997/04/27 07:52:14 1.53 *** *** 1133,1149 Apache 1.2 and above: ! Linux 2.x users should consider defining Rules LINUX_TWEAK=yes ! in the Configuration file which will cause the server to ! use shared memory instead of a scoreboard file. This is known to cause ! compilation problems with some distributions and kernels, so we have not ! enabled it by default. (Patches to conditionally determine the ability ! to set this option are quite welcome.) SVR4 users should consider adding -DHAVE_SHMGET to the EXTRA_CFLAGS in your Configuration. This is believed to work, but we were unable to test it in time for 1.2 release. --- 1133,1150 Apache 1.2 and above: ! Linux 1.x users might be able to add -DHAVE_SHMGET to ! the EXTRA_CFLAGS in your Configuration. This ! might work with some 1.x installations, but won't work with all of ! them. SVR4 users should consider adding -DHAVE_SHMGET to the EXTRA_CFLAGS in your Configuration. This is believed to work, but we were unable to test it in time for 1.2 release. + + See Also: + Stopping and Restarting Apache 1.254 +4 -4 apache/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache/src/CHANGES,v retrieving revision 1.253 retrieving revision 1.254 diff -C3 -r1.253 -r1.254 *** CHANGES 1997/04/27 07:45:02 1.253 --- CHANGES 1997/04/27 07:52:16 1.254 *** *** 82,91 sections missing a trailing /. [Ralf S. Engelschall] ! *) Back out the HAVE_SHMGET change for Linux because it's too late in ! the beta cycle to deal cleanly with compilation problems on the ! myriad of linux systems out there. Linux users should see ! Configuration.tmpl about defining "Rule LINUX_TWEAK=yes". [Dean Gaudet] PR#336, PR#340 *) Redirect did not preserve ?query_strings when present in the client's --- 82,91 sections missing a trailing /. [Ralf S. Engelschall] ! *) Clean up Linux settings in conf.h by detecting 2.x versus 1.x. For ! 1.x the settings are those of pre-1.2b8. For 2.x we include ! HAVE_SHMGET (scoreboard in shared memory rather than file) and ! HAVE_SYS_RESOURCE_H (enable the RLimit commands). [Dean Gaudet] PR#336, PR#340 *) Redirect did not preserve ?query_strings when present in the client's 1.60 +1 -9 apache/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v retrieving revision 1.59 retrieving revision 1.60 diff -C3 -r1.59 -r1.60 *** Configuration.tmpl1997/04/25 22:02:44 1.59 --- Configuration.tmpl1997/04/27 07:52:16 1.60 *** *** 57,63 # functions. The format is: Rule RULE=value # # At present, only the following RULES are known: WANTHSREGEX, SOCKS4, ! # STATUS, IRIXNIS, and LINUX_TWEAK. # # For all Rules, if set to "yes", then Configure knows we want that # capability and does what is required to add it in. If set to "default" --- 57,63 # functions. The format is: Rule RULE=value # # At present, only the following RULES are known: WANTHSREGEX, SOCKS4, ! # STATUS, and IRIXNIS. # # For all Rules, if set to "yes", then Configure knows we want that # capability and does what is required to add it in. If set to "default" *** *** 80,97 # SGI IRIX. If you are, and you are using NIS, you should set this # to 'yes' # - # LINUX_TWEAK: - # Only takes effect if Configure determines that you are running a Linux - # system. This enables two optimizations that work well on i386 linux 2.0 - # or later systems. They aren't enabled by default because of kernel and - # library problems with various versi
cvs commit: apache/src/helpers GuessOS
jim 97/02/19 16:54:21
Modified:src/helpers GuessOS
Log:
NCR fixes, from the source
Revision ChangesPath
1.18 +2 -6 apache/src/helpers/GuessOS
Index: GuessOS
===
RCS file: /export/home/cvs/apache/src/helpers/GuessOS,v
retrieving revision 1.17
retrieving revision 1.18
diff -C3 -r1.17 -r1.18
*** GuessOS 1997/02/10 21:22:23 1.17
--- GuessOS 1997/02/20 00:54:21 1.18
***
*** 166,177
echo "${MACHINE}-whatever-sysv4"; exit 0
;;
! *:4.0:3.0:3[34]??,* | *:4.0:3.0:3[34]??,*)
! echo "${MACHINE}-whatever-sysv4"; exit 0
! ;;
!
! *:4.0:*:3[34]??,* | *:4.0:*:3[34]??,*)
! echo "${MACHINE}-whatever-sysv4"; exit 0
;;
ULTRIX:*)
--- 166,173
echo "${MACHINE}-whatever-sysv4"; exit 0
;;
! *:4.0:3.0:3[34]?? | *:4.0:3.0:3[34]??,*)
! echo "i486-ncr-sysv4"; exit 0
;;
ULTRIX:*)
cvs commit: apache/src/helpers GuessOS
jim 97/02/10 13:22:24 Modified:src Configure buff.c conf.h http_main.c src/helpers GuessOS Log: Add HI-UX support Revision ChangesPath 1.77 +10 -2 apache/src/Configure Index: Configure === RCS file: /export/home/cvs/apache/src/Configure,v retrieving revision 1.76 retrieving revision 1.77 diff -C3 -r1.76 -r1.77 *** Configure 1997/02/06 14:09:55 1.76 --- Configure 1997/02/10 21:22:19 1.77 *** *** 202,219 LIBS="$LIBS -lsocket -llibufc -lbsd" DBM_LIB="-lgdbm" ;; *-hp-hpux10.*) OS='HP-UX 10' CFLAGS="$CFLAGS -DHPUX10" # if we're using the HPUX compiler, add a few flags. ! if [ "$CC" = "cc" ]; then CFLAGS="$CFLAGS -Aa -D_HPUX_SOURCE" fi ;; *-hp-hpux*) OS='HP-UX' CFLAGS="$CFLAGS -DHPUX" ! if [ "$CC" = "cc" ]; then CFLAGS="$CFLAGS -Aa -D_HPUX_SOURCE" fi ;; --- 202,227 LIBS="$LIBS -lsocket -llibufc -lbsd" DBM_LIB="-lgdbm" ;; + *-hi-hiux) + OS='HI-UX' + CFLAGS="$CFLAGS -DHIUX" + # if we're using the HIUX compiler, add a few flags. + if [ ! "$CC" -o "$CC" = "cc" ]; then + CFLAGS="$CFLAGS -Aa -D_HIUX_SOURCE" + fi + ;; *-hp-hpux10.*) OS='HP-UX 10' CFLAGS="$CFLAGS -DHPUX10" # if we're using the HPUX compiler, add a few flags. ! if [ ! "$CC" -o "$CC" = "cc" ]; then CFLAGS="$CFLAGS -Aa -D_HPUX_SOURCE" fi ;; *-hp-hpux*) OS='HP-UX' CFLAGS="$CFLAGS -DHPUX" ! if [ ! "$CC" -o "$CC" = "cc" ]; then CFLAGS="$CFLAGS -Aa -D_HPUX_SOURCE" fi ;; 1.18 +1 -1 apache/src/buff.c Index: buff.c === RCS file: /export/home/cvs/apache/src/buff.c,v retrieving revision 1.17 retrieving revision 1.18 diff -C3 -r1.17 -r1.18 *** buff.c1997/02/10 15:49:54 1.17 --- buff.c1997/02/10 21:22:19 1.18 *** *** 305,311 FD_SET( fb->fd_in, &fds ); tv.tv_sec = 0; tv.tv_usec = 0; ! #ifdef HPUX rv = select( fb->fd_in + 1, (int *)&fds, NULL, NULL, &tv ); #else rv = select( fb->fd_in + 1, &fds, NULL, NULL, &tv ); --- 305,311 FD_SET( fb->fd_in, &fds ); tv.tv_sec = 0; tv.tv_usec = 0; ! #ifdef SELECT_NEEDS_CAST rv = select( fb->fd_in + 1, (int *)&fds, NULL, NULL, &tv ); #else rv = select( fb->fd_in + 1, &fds, NULL, NULL, &tv ); 1.78 +18 -7 apache/src/conf.h Index: conf.h === RCS file: /export/home/cvs/apache/src/conf.h,v retrieving revision 1.77 retrieving revision 1.78 diff -C3 -r1.77 -r1.78 *** conf.h1997/02/10 00:40:08 1.77 --- conf.h1997/02/10 21:22:20 1.78 *** *** 110,115 --- 110,127 #define HAVE_CRYPT_H #define NO_LONG_DOUBLE + #elif defined(HIUX) + #define HAVE_SYS_RESOURCE_H + #undef HAS_GMTOFF + #define NO_KILLPG + #undef NO_SETSID + #ifndef _HIUX_SOURCE + #define _HIUX_SOURCE + #endif + #define JMP_BUF sigjmp_buf + #define HAVE_SHMGET + #define SELECT_NEEDS_CAST + #elif defined(HPUX) || defined(HPUX10) #define HAVE_SYS_RESOURCE_H #undef HAVE_GMTOFF *** *** 118,129 #ifndef _HPUX_SOURCE #define _HPUX_SOURCE #endif - #ifndef HPUX10 - #define getwd(d) getcwd(d,MAX_STRING_LEN) - #endif #define JMP_BUF sigjmp_buf #define HAVE_SHMGET #ifndef HPUX10 typedef int rlim_t; #endif --- 130,140 #ifndef _HPUX_SOURCE #define _HPUX_SOURCE #endif #define JMP_BUF sigjmp_buf #define HAVE_SHMGET #ifndef HPUX10 + #define SELECT_NEEDS_CAST + #define getwd(d) getcwd(d,MAX_STRING_LEN) typedef int rlim_t; #endif *** *** 283,292 extern int accept(), gethostname(), connect(), lstat(); extern int select(), killpg(), shutdown(); extern int initgroups(), setsockopt(); ! extern char *shmat(int, char *, int); ! extern int shmctl(int, int, struct shmid_ds *); ! extern int shmget(key_t, int, int); ! extern char *sbrk(int); extern char *crypt(); extern char *getwd(); #include --- 294,303 extern int accept(), gethostname(), connect(), lstat(); extern int select(), killpg(), shutdown(); extern int initgroups(), setsockopt(); ! extern char *shmat(); ! extern int shmctl(); ! extern int shmget(); ! extern char *sbrk(); extern char *crypt(); extern char *getwd(); #include 1.118 +3 -3 apache/
cvs commit: apache/src/helpers GuessOS
jim 97/01/25 14:58:30
Modified:src/helpers GuessOS
Log:
Fix Sunos5.6/GuessOS failure with uname -X
Revision ChangesPath
1.16 +138 -139 apache/src/helpers/GuessOS
Index: GuessOS
===
RCS file: /export/home/cvs/apache/src/helpers/GuessOS,v
retrieving revision 1.15
retrieving revision 1.16
diff -C3 -r1.15 -r1.16
*** GuessOS 1997/01/10 11:20:47 1.15
--- GuessOS 1997/01/25 22:58:29 1.16
***
*** 50,197
;;
esac
fi
! else
# Now we simply scan though... In most cases, the SYSTEM info is enough
#
! case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
! A/UX:*)
! echo "m68k-apple-aux3"; exit 0
! ;;
!
! AIX:*)
! echo "${MACHINE}-ibm-aix"; exit 0
! ;;
!
! dgux:*)
! echo "${MACHINE}-dg-dgux"; exit 0
! ;;
!
! HP-UX:*)
! HPUXVER=`echo ${RELEASE}|sed -e 's/[^.]*.[0B]*//'`
! case "$HPUXVER" in
! 10.*)
! echo "${MACHINE}-hp-hpux10."; exit 0
! ;;
! *)
! echo "${MACHINE}-hp-hpux"; exit 0
! ;;
! esac
! ;;
!
! IRIX:*)
! echo "${MACHINE}-sgi-irix"; exit 0
! ;;
!
! IRIX64:*)
! echo "${MACHINE}-sgi-irix64"; exit 0
! ;;
!
! Linux:*)
! echo "${MACHINE}-whatever-linux"; exit 0
! ;;
!
! LynxOS:*)
! echo "${MACHINE}-lynx-lynxos"; exit 0
! ;;
!
! BSD/386:*:*:*486*|BSD/OS:*:*:*:*486*)
! echo "i486-whatever-bsdi"; exit 0
! ;;
!
! BSD/386:*|BSD/OS:*)
! echo "${MACHINE}-whatever-bsdi"; exit 0
! ;;
!
! FreeBSD:*:*:*486*)
! echo "i486-whatever-freebsd"; exit 0
! ;;
!
! FreeBSD:*)
! echo "${MACHINE}-whatever-freebsd"; exit 0
! ;;
!
! NetBSD:*:*:*486*)
! echo "i486-whatever-netbsd"; exit 0
! ;;
!
! NetBSD:*)
! echo "${MACHINE}-whatever-netbsd"; exit 0
! ;;
!
! OpenBSD:*)
! echo "${MACHINE}-whatever-openbsd"; exit 0
! ;;
!
! OSF1:*:*:*alpha*)
! echo "${MACHINE}-dec-osf"; exit 0
! ;;
!
! QNX:*)
! case "$VERSION" in
! 423)
! echo "${MACHINE}-qssl-qnx32"
! ;;
! *)
! echo "${MACHINE}-qssl-qnx"
! ;;
! esac
! exit 0
! ;;
!
! Paragon*:*:*:*)
! echo "i860-intel-osf1"; exit 0
! ;;
!
! SunOS:5.*)
! echo "${MACHINE}-sun-solaris2"; exit 0
! ;;
!
! SunOS:*)
! echo "${MACHINE}-sun-sunos4"; exit 0
! ;;
!
! UNIX_System_V:4.*:*)
! echo "${MACHINE}-whatever-sysv4"; exit 0
! ;;
!
! *:4*:R4*:m88k)
! echo "${MACHINE}-whatever-sysv4"; exit 0
! ;;
!
! DYNIX/ptx:4*:*)
! echo "${MACHINE}-whatever-sysv4"; exit 0
! ;;
!
! *:4.0:3.0:3[34]??,* | *:4.0:3.0:3[34]??,*)
! echo "${MACHINE}-whatever-sysv4"; exit 0
! ;;
!
! *:4.0:*:3[34]??,* | *:4.0:*:3[34]??,*)
! echo "${MACHINE}-whatever-sysv4"; exit 0
! ;;
!
! ULTRIX:*)
! echo "${MACHINE}-unknown-ultrix"; exit 0
! ;;
!
! SINIX*)
! echo "${MACHINE}-sni-sysv4"; exit 0
! ;;
!
! machten:*)
!echo "${MACHINE}-tenon-${SYSTEM}"; exit 0;
!;;
!
! library:*)
! echo "${MACHINE}-ncr-sysv4"; exit 0
! ;;
!
! ConvexOS:*:11.0:*)
! echo "${MACHINE}-v11-${SYSTEM}"; exit 0;
! ;;
! esac
! fi
#
# Ugg. These are all we can determine by what we know about
--- 50,196
;;
esac
fi
! fi
# Now we simply scan though... In most cases, the SYSTEM info is enough
#
! case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
! A/UX:*)
! echo "m68k-apple-aux3"; exit 0
! ;;
!
! AIX:*)
! echo "${MACHINE}-ibm-aix"; exit 0
! ;;
!
! dgux:*)
! echo "${MACHINE}-dg-dgux"; exit 0
! ;;
!
! HP-UX:*)
! HPUXVER=`echo ${RELEASE}|sed -e 's/[^.]*.[0B]*//'`
! case "$HPUXVER" in
! 10.*)
! echo "${MACHINE}-hp-hpux10."; exit 0
! ;;
! *)
! echo "${MACHINE}-hp-hpux"; exit 0
! ;;
! esac
! ;;
!
! IRIX:*)
! echo "${MACHINE}-sgi-irix"; exit 0
! ;;
!
! IRIX64:*)
! echo "${MACHINE}-sgi-irix64"; exit 0
! ;;
cvs commit: apache/src/helpers GuessOS
brian 97/01/10 03:20:48
Modified:src Configure conf.h
src/helpers GuessOS
Log:
Reviewed by: Brian Behlendorf
Submitted by: [EMAIL PROTECTED]
Added entry for "openbsd".
Revision ChangesPath
1.69 +3 -0 apache/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.68
retrieving revision 1.69
diff -C3 -r1.68 -r1.69
*** Configure 1997/01/10 11:17:23 1.68
--- Configure 1997/01/10 11:20:41 1.69
***
*** 255,260
--- 255,263
LIBS="$LIBS -lcrypt"
DBM_LIB=""
;;
+ *-openbsd*)
+ OS='OpenBSD'
+ ;;
*-next-nextstep*)
OS='NeXT'
CFLAGS="$CFLAGS -DNEXT"
1.68 +1 -1 apache/src/conf.h
Index: conf.h
===
RCS file: /export/home/cvs/apache/src/conf.h,v
retrieving revision 1.67
retrieving revision 1.68
diff -C3 -r1.67 -r1.68
*** conf.h1997/01/10 09:34:41 1.67
--- conf.h1997/01/10 11:20:41 1.68
***
*** 327,333
/* A lot of SVR4 systems need this */
#define USE_FCNTL_SERIALIZED_ACCEPT
! #elif defined(__NetBSD__)
#define HAVE_SYS_RESOURCE_H
#define HAVE_GMTOFF
#undef NO_KILLPG
--- 327,333
/* A lot of SVR4 systems need this */
#define USE_FCNTL_SERIALIZED_ACCEPT
! #elif defined(__NetBSD__) || defined(__OpenBSD__)
#define HAVE_SYS_RESOURCE_H
#define HAVE_GMTOFF
#undef NO_KILLPG
1.15 +4 -0 apache/src/helpers/GuessOS
Index: GuessOS
===
RCS file: /export/home/cvs/apache/src/helpers/GuessOS,v
retrieving revision 1.14
retrieving revision 1.15
diff -C3 -r1.14 -r1.15
*** GuessOS 1997/01/08 13:04:48 1.14
--- GuessOS 1997/01/10 11:20:47 1.15
***
*** 118,123
--- 118,127
echo "${MACHINE}-whatever-netbsd"; exit 0
;;
+ OpenBSD:*)
+ echo "${MACHINE}-whatever-openbsd"; exit 0
+ ;;
+
OSF1:*:*:*alpha*)
echo "${MACHINE}-dec-osf"; exit 0
;;
cvs commit: apache/src/helpers GuessOS
jim 97/01/08 05:04:48
Modified:src Configure conf.h
src/helpers GuessOS
Log:
Add several new platforms
Revision ChangesPath
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.h1997/01/06 21:12:02 1.65
--- conf.h1997/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
#define JMB_BUF jmp_buf
typedef int rlim_t;
+
+ #elif defined(ISC)
+ #include
+ #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 -21apache/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 cas
cvs commit: apache/src/helpers GuessOS
jim 97/01/06 13:12:06
Modified:src Configure conf.h
src/helpers GuessOS
Log:
Added CONVEXOS11 and minor fix
Revision ChangesPath
1.65 +6 -0 apache/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.64
retrieving revision 1.65
diff -C3 -r1.64 -r1.65
*** Configure 1997/01/06 17:27:54 1.64
--- Configure 1997/01/06 21:12:01 1.65
***
*** 344,349
--- 344,355
OS='MachTen'
LFLAGS="$LFLAGS -Xlstack=131072 -Xldelcsect"
;;
+ *convex-v11*)
+ OS='CONVEXOS11'
+ CFLAGS="$CFLAGS -DCONVEXOS11"
+ CC='cc'
+ DEF_WANTHSREGEX=yes
+ ;;
*) # default: Catch systems we don't know about
echo Sorry, but we cannot grok \"$PLAT\"
echo uname -m
1.65 +9 -1 apache/src/conf.h
Index: conf.h
===
RCS file: /export/home/cvs/apache/src/conf.h,v
retrieving revision 1.64
retrieving revision 1.65
diff -C3 -r1.64 -r1.65
*** conf.h1997/01/01 18:10:15 1.64
--- conf.h1997/01/06 21:12:02 1.65
***
*** 419,424
--- 419,432
#define FCNTL_SERIALIZED_ACCEPT
#endif
+ /* Convex OS v11 */
+ #elif defined(CONVEXOS11)
+ #define NO_TIMEZONE
+ #include
+ #include
+ #define JMB_BUF jmp_buf
+ typedef int rlim_t;
+
/* Unknown system - Edit these to match */
#else
#ifdef BSD
***
*** 481,487
#include
#include
#include
! #ifndef QNX
#include
#endif
#ifdef NEED_PROCESS_H
--- 489,495
#include
#include
#include
! #if !defined(QNX) && !defined(CONVEXOS11)
#include
#endif
#ifdef NEED_PROCESS_H
1.13 +5 -0 apache/src/helpers/GuessOS
Index: GuessOS
===
RCS file: /export/home/cvs/apache/src/helpers/GuessOS,v
retrieving revision 1.12
retrieving revision 1.13
diff -C3 -r1.12 -r1.13
*** GuessOS 1997/01/06 17:27:55 1.12
--- GuessOS 1997/01/06 21:12:05 1.13
***
*** 164,172
--- 164,177
machten:*)
echo "${MACHINE}-tenon-${SYSTEM}"; exit 0;
+;;
library:*)
echo "${MACHINE}-ncr-sysv4"; exit 0
+ ;;
+
+ ConvexOS:*:11.0:*)
+ echo "${MACHINE}-v11-${SYSTEM}"; exit 0;
;;
esac
cvs commit: apache/src/helpers GuessOS
jim 97/01/06 09:27:56
Modified:src Configure
src/helpers GuessOS
Log:
MachTen fixes for Configure family
Revision ChangesPath
1.64 +2 -1 apache/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.63
retrieving revision 1.64
diff -C3 -r1.63 -r1.64
*** Configure 1996/12/28 00:09:09 1.63
--- Configure 1997/01/06 17:27:54 1.64
***
*** 340,346
CFLAGS="-DULTRIX"
DEF_WANTHSREGEX=yes
;;
! *-powerpc-tenon-*)
LFLAGS="$LFLAGS -Xlstack=131072 -Xldelcsect"
;;
*) # default: Catch systems we don't know about
--- 340,347
CFLAGS="-DULTRIX"
DEF_WANTHSREGEX=yes
;;
! *powerpc-tenon-machten*)
! OS='MachTen'
LFLAGS="$LFLAGS -Xlstack=131072 -Xldelcsect"
;;
*) # default: Catch systems we don't know about
1.12 +3 -0 apache/src/helpers/GuessOS
Index: GuessOS
===
RCS file: /export/home/cvs/apache/src/helpers/GuessOS,v
retrieving revision 1.11
retrieving revision 1.12
diff -C3 -r1.11 -r1.12
*** GuessOS 1996/12/11 13:48:59 1.11
--- GuessOS 1997/01/06 17:27:55 1.12
***
*** 162,167
--- 162,170
echo "${MACHINE}-sni-sysv4"; exit 0
;;
+ machten:*)
+echo "${MACHINE}-tenon-${SYSTEM}"; exit 0;
+
library:*)
echo "${MACHINE}-ncr-sysv4"; exit 0
;;
cvs commit: apache/src/helpers GuessOS
jim 96/12/11 05:48:59
Modified:src Configure
src/helpers GuessOS
Log:
Added SINIX OS
Revision ChangesPath
1.56 +6 -0 apache/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.55
retrieving revision 1.56
diff -C3 -r1.55 -r1.56
*** Configure 1996/12/10 23:43:25 1.55
--- Configure 1996/12/11 13:48:57 1.56
***
*** 296,301
--- 296,307
CFLAGS="$CFLAGS -DUW"
LIBS="$LIBS -lsocket -lnsl -lcrypt"
;;
+ *-sni-sysv4*)
+ OS='SVR4'
+ CFLAGS="$CFLAGS -DSVR4"
+ DEF_WANTHSREGEX=yes
+ LIBS="$LIBS -lsocket -lnsl -lc"
+ ;;
*-sysv4*)
OS='SVR4'
CFLAGS="$CFLAGS -DSVR4"
1.11 +1 -1 apache/src/helpers/GuessOS
Index: GuessOS
===
RCS file: /export/home/cvs/apache/src/helpers/GuessOS,v
retrieving revision 1.10
retrieving revision 1.11
diff -C3 -r1.10 -r1.11
*** GuessOS 1996/12/09 05:00:49 1.10
--- GuessOS 1996/12/11 13:48:59 1.11
***
*** 159,165
;;
SINIX*)
! echo "${MACHINE}-whatever-sysv4"; exit 0
;;
library:*)
--- 159,165
;;
SINIX*)
! echo "${MACHINE}-sni-sysv4"; exit 0
;;
library:*)
cvs commit: apache/src/helpers GuessOS
brian 96/12/08 21:00:50
Modified:src Configure conf.h
src/helpers GuessOS
Log:
Reviewed by: Brian Behlendorf
Submitted by: Alan Burlison <[EMAIL PROTECTED]>
Enhancements to allow Unixware 2.1.1 to be recognized and compile.
Revision ChangesPath
1.49 +6 -1 apache/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.48
retrieving revision 1.49
diff -C3 -r1.48 -r1.49
*** Configure 1996/12/09 01:00:38 1.48
--- Configure 1996/12/09 05:00:41 1.49
***
*** 271,280
CFLAGS="$CFLAGS -DSUNOS4 -DUSEBCOPY"
DEF_WANTHSREGEX=yes
;;
! *-unixware*)
DEF_WANTHSREGEX=yes
OS='Unixware'
CFLAGS="$CFLAGS -DSVR4"
LIBS="$LIBS -lsocket -lnsl -lcrypt"
;;
*-sysv4*)
--- 271,285
CFLAGS="$CFLAGS -DSUNOS4 -DUSEBCOPY"
DEF_WANTHSREGEX=yes
;;
! *-unixware)
DEF_WANTHSREGEX=yes
OS='Unixware'
CFLAGS="$CFLAGS -DSVR4"
+ LIBS="$LIBS -lsocket -lnsl -lcrypt"
+ ;;
+ *-unixware211)
+ OS='Unixware 2.1.1'
+ CFLAGS="$CFLAGS -DUW"
LIBS="$LIBS -lsocket -lnsl -lcrypt"
;;
*-sysv4*)
1.56 +18 -0 apache/src/conf.h
Index: conf.h
===
RCS file: /export/home/cvs/apache/src/conf.h,v
retrieving revision 1.55
retrieving revision 1.56
diff -C3 -r1.55 -r1.56
*** conf.h1996/12/09 01:00:39 1.55
--- conf.h1996/12/09 05:00:42 1.56
***
*** 282,287
--- 282,305
/* A lot of SVR4 systems need this */
#define USE_FCNTL_SERIALIZED_ACCEPT
+ #elif defined(UW)
+ #define NO_KILLPG
+ #undef NO_SETSID
+ #undef NEED_STRDUP
+ #define NEED_STRCASECMP
+ #define NEED_STRNCASECMP
+ #define bzero(a,b) memset(a,0,b)
+ #define JMP_BUF sigjmp_buf
+ #define getwd(d) getcwd(d,MAX_STRING_LEN)
+ #define HAVE_RESOURCE
+ #define HAVE_MMAP
+ #define HAVE_SHMGET
+ #define HAVE_CRYPT_H
+ #define HAVE_SYS_SELECT_H
+ #define HAVE_SYS_RESOURCE_H
+ #include
+ #define _POSIX_SOURCE
+
#elif defined(DGUX)
#define NO_KILLPG
#undef NO_SETSID
1.10 +5 -1 apache/src/helpers/GuessOS
Index: GuessOS
===
RCS file: /export/home/cvs/apache/src/helpers/GuessOS,v
retrieving revision 1.9
retrieving revision 1.10
diff -C3 -r1.9 -r1.10
*** GuessOS 1996/12/09 03:08:35 1.9
--- GuessOS 1996/12/09 05:00:49 1.10
***
*** 32,38
echo "whatever-whatever-sco5"; exit 0
;;
4.2MP)
! echo "whatever-whatever-unixware2"; exit 0
;;
4.2)
echo "whatever-whatever-unixware1"; exit 0
--- 32,42
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
cvs commit: apache/src/helpers GuessOS
brian 96/12/08 19:08:36 Modified:src/helpers GuessOS Log: Removed reference to the new-httpd mailing list. Revision ChangesPath 1.9 +1 -1 apache/src/helpers/GuessOS Index: GuessOS === RCS file: /export/home/cvs/apache/src/helpers/GuessOS,v retrieving revision 1.8 retrieving revision 1.9 diff -C3 -r1.8 -r1.9 *** GuessOS 1996/12/08 23:33:54 1.8 --- GuessOS 1996/12/09 03:08:35 1.9 *** *** 5,11 # Apache, it follows under Apache's regular licensing # with one specific addition: Any changes or additions # to this script should be Emailed to the Apache ! # group ([EMAIL PROTECTED]) in general and to # Jim Jagielski ([EMAIL PROTECTED]) in specific. # # Be as similar to the output of config.guess/config.sub --- 5,11 # Apache, it follows under Apache's regular licensing # with one specific addition: Any changes or additions # to this script should be Emailed to the Apache ! # group ([EMAIL PROTECTED]) in general and to # Jim Jagielski ([EMAIL PROTECTED]) in specific. # # Be as similar to the output of config.guess/config.sub
cvs commit: apache/src/helpers GuessOS
ben 96/12/08 15:33:55
Modified:src/helpers GuessOS
Log:
Get rid of unnecessary backslashes.
Revision ChangesPath
1.8 +4 -4 apache/src/helpers/GuessOS
Index: GuessOS
===
RCS file: /export/home/cvs/apache/src/helpers/GuessOS,v
retrieving revision 1.7
retrieving revision 1.8
diff -C3 -r1.7 -r1.8
*** GuessOS 1996/12/05 22:02:52 1.7
--- GuessOS 1996/12/08 23:33:54 1.8
***
*** 25,40
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)
echo "whatever-whatever-unixware2"; exit 0
;;
! 4\.2)
echo "whatever-whatever-unixware1"; exit 0
;;
esac
--- 25,40
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)
echo "whatever-whatever-unixware2"; exit 0
;;
! 4.2)
echo "whatever-whatever-unixware1"; exit 0
;;
esac
cvs commit: apache/src/helpers GuessOS
jim 96/12/05 14:02:56 Modified:src/helpers GuessOS Log: GuessOS cleanup: Unixware and NeXT Revision ChangesPath 1.7 +9 -8 apache/src/helpers/GuessOS Index: GuessOS === RCS file: /export/home/cvs/apache/src/helpers/GuessOS,v retrieving revision 1.6 retrieving revision 1.7 diff -C3 -r1.6 -r1.7 *** GuessOS 1996/12/05 14:07:06 1.6 --- GuessOS 1996/12/05 22:02:52 1.7 *** *** 34,39 --- 34,42 4\.2MP) echo "whatever-whatever-unixware2"; exit 0 ;; + 4\.2) + echo "whatever-whatever-unixware1"; exit 0 + ;; esac else # Now we simply scan though... In most cases, the SYSTEM info is enough *** *** 176,189 fi # Now NeXT ! if hostinfo > /dev/null 2>/dev/null; then ! ISNEXT=`hostinfo` ! case "$ISNEXT" in ! *NeXT*) ! echo "whatever-next-nextstep"; exit 0 ! ;; ! esac ! fi # At this point we gone through all the one's # we know of: Punt --- 179,190 fi # Now NeXT ! ISNEXT=`hostinfo 2>/dev/null` ! case "$ISNEXT" in ! *NeXT*) ! echo "whatever-next-nextstep"; exit 0 ! ;; ! esac # At this point we gone through all the one's # we know of: Punt
cvs commit: apache/src/helpers GuessOS
ben 96/12/05 06:07:07
Modified:src Configure util.c
src/helpers GuessOS
Log:
More QNX patches.
Submitted by: Martin Zimmerman <[EMAIL PROTECTED]> (adapted by Ben Laurie)
Revision ChangesPath
1.45 +6 -1 apache/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.44
retrieving revision 1.45
diff -C3 -r1.44 -r1.45
*** Configure 1996/12/05 11:16:09 1.44
--- Configure 1996/12/05 14:07:03 1.45
***
*** 235,244
OS='DEC OSF/1'
CFLAGS="$CFLAGS -DOSF1"
;;
! QNX)
DEF_WANTHSREGEX=yes
OS='QNX'
CFLAGS="$CFLAGS -DQNX"
LIBS="$LIBS -N128k -lsocket"
;;
*-sco3*)
--- 235,249
OS='DEC OSF/1'
CFLAGS="$CFLAGS -DOSF1"
;;
! *-qnx)
DEF_WANTHSREGEX=yes
OS='QNX'
CFLAGS="$CFLAGS -DQNX"
+ LIBS="$LIBS -N128k -lsocket"
+ ;;
+ *-qnx32)
+ OS='QNX32'
+ CFLAGS="$CFLAGS -DQNX -mf -3"
LIBS="$LIBS -N128k -lsocket"
;;
*-sco3*)
1.36 +10 -0 apache/src/util.c
Index: util.c
===
RCS file: /export/home/cvs/apache/src/util.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -C3 -r1.35 -r1.36
*** util.c1996/12/02 15:35:01 1.35
--- util.c1996/12/05 14:07:04 1.36
***
*** 197,202
--- 197,207
* AT&T V8 regexp package.
*/
+ #ifdef QNX
+ # define rm_so rm_sp
+ # define rm_eo rm_ep
+ #endif
+
char *pregsub(pool *p, const char *input, const char *source,
size_t nmatch, regmatch_t pmatch[]) {
const char *src = input;
***
*** 260,265
--- 265,275
return dest;
}
+
+ #ifdef QNX
+ # undef rm_so
+ # undef rm_eo
+ #endif
/*
* Parse .. so we don't compromise security
1.6 +12 -0 apache/src/helpers/GuessOS
Index: GuessOS
===
RCS file: /export/home/cvs/apache/src/helpers/GuessOS,v
retrieving revision 1.5
retrieving revision 1.6
diff -C3 -r1.5 -r1.6
*** GuessOS 1996/12/05 10:29:11 1.5
--- GuessOS 1996/12/05 14:07:06 1.6
***
*** 107,112
--- 107,124
echo "${MACHINE}-dec-osf"; exit 0
;;
+ QNX:*)
+ case "$VERSION" in
+ 423)
+ echo "${MACHINE}-qssl-qnx32"
+ ;;
+ *)
+ echo "${MACHINE}-qssl-qnx"
+ ;;
+ esac
+ exit 0
+ ;;
+
SunOS:5.*)
echo "${MACHINE}-sun-solaris2"; exit 0
;;
cvs commit: apache/src/helpers GuessOS
ben 96/12/05 02:29:12
Modified:src/helpers GuessOS
Log:
SCO5 and NCR fixes.
Revision ChangesPath
1.5 +5 -1 apache/src/helpers/GuessOS
Index: GuessOS
===
RCS file: /export/home/cvs/apache/src/helpers/GuessOS,v
retrieving revision 1.4
retrieving revision 1.5
diff -C3 -r1.4 -r1.5
*** GuessOS 1996/12/04 01:48:15 1.4
--- GuessOS 1996/12/05 10:29:11 1.5
***
*** 28,34
3\.2v4\.2)
echo "whatever-whatever-sco3"; exit 0
;;
! 3\.2v5\.0\.0)
echo "whatever-whatever-sco5"; exit 0
;;
4\.2MP)
--- 28,34
3\.2v4\.2)
echo "whatever-whatever-sco3"; exit 0
;;
! 3\.2v5\.0*)
echo "whatever-whatever-sco5"; exit 0
;;
4\.2MP)
***
*** 141,146
--- 141,150
SINIX*)
echo "${MACHINE}-whatever-sysv4"; exit 0
+ ;;
+
+ library:*)
+ echo "${MACHINE}-ncr-sysv4"; exit 0
;;
esac
cvs commit: apache/src/helpers GuessOS
ben 96/12/03 09:41:25
Modified:src/helpers GuessOS
Log:
SINIX fix.
Revision ChangesPath
1.3 +4 -0 apache/src/helpers/GuessOS
Index: GuessOS
===
RCS file: /export/home/cvs/apache/src/helpers/GuessOS,v
retrieving revision 1.2
retrieving revision 1.3
diff -C3 -r1.2 -r1.3
*** GuessOS 1996/12/03 14:15:30 1.2
--- GuessOS 1996/12/03 17:41:22 1.3
***
*** 139,144
--- 139,148
echo "${MACHINE}-unknown-ultrix"; exit 0
;;
+ SINIX*)
+ echo "${MACHINE}-whatever-sysv4"; exit 0
+ ;;
+
esac
fi
cvs commit: apache/src/helpers GuessOS
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 ChangesPath
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
