jim 98/02/21 07:00:41
Modified: src CHANGES Configure
src/helpers GuessOS
Log:
PR: 1450
Obtained from: Andrey Chernov <[EMAIL PROTECTED]>
Submitted by: Jim
Make Configure and GuessOS aware of FreeBSD versions. If version 3,
then we handle the fact that char's aren't unsigned and that FreeBSD3
has a good system regex package. Earler versions are unaffected.
Revision Changes Path
1.650 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.649
retrieving revision 1.650
diff -u -r1.649 -r1.650
--- CHANGES 1998/02/21 12:26:20 1.649
+++ CHANGES 1998/02/21 15:00:37 1.650
@@ -1,5 +1,9 @@
Changes with Apache 1.3b6
+ *) [PORT] Recognize FreeBSD-3 so we can use the OS regex as well
+ as handling unsigned-chars [Andrey Chernov <[EMAIL PROTECTED]>
+ and Jim] PR#1450
+
*) Use SA_RESETHAND or SA_ONESHOT when installing the coredump handlers.
In particular the handlers could trigger themselves into an infinite
loop if RLimitMem was used with a small amount of memory -- too small
1.186 +13 -6 apache-1.3/src/Configure
Index: Configure
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- Configure 1998/02/14 13:43:59 1.185
+++ Configure 1998/02/21 15:00:38 1.186
@@ -358,7 +358,14 @@
DB_LIB=""
;;
*-freebsd*)
- OS='FreeBSD'
+ PLATOSVERS=`echo $PLAT | sed 's/^.*freebsd//'`
+ OS='FreeBSD $PLATOSVERS'
+ case "$PLATOSVERS" in
+ 3*)
+ DEF_WANTHSREGEX=no
+ CFLAGS="$CFLAGS -funsigned-char"
+ ;;
+ esac
LIBS="$LIBS -lcrypt"
DBM_LIB=""
DB_LIB=""
@@ -413,17 +420,17 @@
DEF_WANTHSREGEX=no
;;
*-solaris2*)
- SOLVER=`echo $PLAT | sed 's/^.*solaris2.//'`
- OS="Solaris $SOLVER"
- CFLAGS="$CFLAGS -DSOLARIS2=$SOLVER"
+ PLATOSVERS=`echo $PLAT | sed 's/^.*solaris2.//'`
+ OS="Solaris $PLATOSVERS"
+ CFLAGS="$CFLAGS -DSOLARIS2=$PLATOSVERS"
LIBS="$LIBS -lsocket -lnsl"
- case "$SOLVER" in
+ case "$PLATOSVERS" in
2[56789]*)
LIBS="$LIBS -lpthread"
;;
esac
DBM_LIB=""
- case "$SOLVER" in
+ case "$PLATOSVERS" in
2[01234]*)
DEF_WANTHSREGEX=yes
;;
1.34 +4 -2 apache-1.3/src/helpers/GuessOS
Index: GuessOS
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/helpers/GuessOS,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- GuessOS 1998/01/13 23:11:06 1.33
+++ GuessOS 1998/02/21 15:00:41 1.34
@@ -113,11 +113,13 @@
;;
FreeBSD:*:*:*486*)
- echo "i486-whatever-freebsd"; exit 0
+ FREEBSDVERS=`echo ${RELEASE}|sed -e 's/[-(].*//'`
+ echo "i486-whatever-freebsd${FREEBSDVERS}"; exit 0
;;
FreeBSD:*)
- echo "${MACHINE}-whatever-freebsd"; exit 0
+ FREEBSDVERS=`echo ${RELEASE}|sed -e 's/[-(].*//'`
+ echo "${MACHINE}-whatever-freebsd${FREEBSDVERS}"; exit 0
;;
NetBSD:*:*:*486*)
