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 Changes Path
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.h 1996/12/09 01:00:39 1.55
--- conf.h 1996/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 <sys/time.h>
+ #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
