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 Changes Path
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.c 1996/12/02 15:35:01 1.35
--- util.c 1996/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
;;
