jim 97/09/09 15:33:56
Modified: src Configure
src/main conf.h
Log:
Be consistant with Configure (which may be wrong but it's a start)
and assume Pthreads is only available with Solaris 2.5.0 and later
Revision Changes Path
1.151 +3 -3 apachen/src/Configure
Index: Configure
===================================================================
RCS file: /export/home/cvs/apachen/src/Configure,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- Configure 1997/09/07 00:34:03 1.150
+++ Configure 1997/09/09 22:33:53 1.151
@@ -354,7 +354,7 @@
DEF_WANTHSREGEX=no
;;
*-solaris2*)
- SOLVER=`echo $PLAT | sed -e 's/^.*solaris2.//'`
+ SOLVER=`echo $PLAT | sed 's/^.*solaris2.//'`
OS="Solaris $SOLVER"
CFLAGS="$CFLAGS -DSOLARIS2=$SOLVER"
LIBS="$LIBS -lsocket -lnsl"
@@ -818,7 +818,7 @@
# create modules.c
-sed -e 's/_module//' $tmpfile | awk >modules.c '
+sed 's/_module//' $tmpfile | awk >modules.c '
BEGIN {
modules[n++] = "core"
pmodules[pn++] = "core"
@@ -1033,7 +1033,7 @@
echo "Creating Makefile in $moddir"
cat Makefile.config > $moddir/Makefile
- basedir=`echo $moddir | sed 's|^[^/]*/||g'`
+ basedir=`echo $moddir | sed 's/^[^/]*\///g'`
awk >> $moddir/Makefile < $tmpfile '
BEGIN {
printf "OBJS="
1.132 +4 -0 apachen/src/main/conf.h
Index: conf.h
===================================================================
RCS file: /export/home/cvs/apachen/src/main/conf.h,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- conf.h 1997/09/09 18:36:58 1.131
+++ conf.h 1997/09/09 22:33:55 1.132
@@ -104,7 +104,11 @@
#define JMP_BUF sigjmp_buf
/*#define USE_FCNTL_SERIALIZED_ACCEPT*/
/*#define USE_SYSVSEM_SERIALIZED_ACCEPT*/
+#if SOLARIS2 < 250
+#define USE_FCNTL_SERIALIZED_ACCEPT
+#else
#define USE_PTHREAD_SERIALIZED_ACCEPT
+#endif
#define NEED_UNION_SEMUN
#define HAVE_MMAP
#define USE_MMAP_FILES
