cvs commit: apache-2.0/src acinclude.m4
sascha 99/12/29 15:41:57 Modified:src acinclude.m4 Log: (APACHE_INADDR_NONE) Additionally include sys/types.h, if it is available. Also added confdefs checks for the other included header files. Revision ChangesPath 1.13 +9 -0 apache-2.0/src/acinclude.m4 Index: acinclude.m4 === RCS file: /home/cvs/apache-2.0/src/acinclude.m4,v retrieving revision 1.12 retrieving revision 1.13 diff -u -u -r1.12 -r1.13 --- acinclude.m4 1999/12/24 21:22:27 1.12 +++ acinclude.m4 1999/12/29 23:41:56 1.13 @@ -147,9 +147,18 @@ dnl AC_DEFUN(APACHE_INADDR_NONE,[ AC_TRY_COMPILE([ +#ifdef HAVE_SYS_TYPES_H +#include sys/types.h +#endif +#ifdef HAVE_SYS_SOCKET_H #include sys/socket.h +#endif +#ifdef HAVE_NETINET_IN_H #include netinet/in.h +#endif +#ifdef HAVE_ARPA_INET_H #include arpa/inet.h +#endif ],[ unsigned long foo = INADDR_NONE; ],[
cvs commit: apache-2.0/src/regex config.m4
sascha 99/12/29 15:52:29 Modified:src/regex config.m4 Log: Define HS regex-specific macro, if memmove is not available. Revision ChangesPath 1.4 +5 -0 apache-2.0/src/regex/config.m4 Index: config.m4 === RCS file: /home/cvs/apache-2.0/src/regex/config.m4,v retrieving revision 1.3 retrieving revision 1.4 diff -u -u -r1.3 -r1.4 --- config.m4 1999/12/20 03:09:51 1.3 +++ config.m4 1999/12/29 23:52:28 1.4 @@ -1,3 +1,5 @@ +AC_CHECK_FUNCS(memmove) + AC_MSG_CHECKING(whether to use the provided HS regex library) AC_ARG_ENABLE(hsregex, [ --enable-hsregex Use the HS regex library ], @@ -5,6 +7,9 @@ [apache_cv_hsregex=yes]) if test $apache_cv_hsregex = yes; then +if test $ac_cv_func_memmove = no; then +CFLAGS=$CFLAGS -DUSEBCOPY +fi REGEX_LIB=regex/libregex.la REGEX_DIR=regex AC_DEFINE(USE_HSREGEX,, [Define this if HS regex will be used])
cvs commit: apache-2.0/src buildconf
sascha 99/12/29 15:53:15 Modified:src buildconf Log: Fix IFS handling. This has the nice side effect that we do not need tr anymore. Revision ChangesPath 1.10 +4 -3 apache-2.0/src/buildconf Index: buildconf === RCS file: /home/cvs/apache-2.0/src/buildconf,v retrieving revision 1.9 retrieving revision 1.10 diff -u -u -r1.9 -r1.10 --- buildconf 1999/12/22 03:16:37 1.9 +++ buildconf 1999/12/29 23:53:14 1.10 @@ -23,7 +23,8 @@ echoto build APACHE from CVS. exit 1 fi -IFS=.; set $am_version; IFS=' ' +old_IFS=$IFS +IFS=.; set $am_version; IFS=$old_IFS if test $1 = 1 -a $2 -lt 4 || test $1 -lt 1; then echo buildconf: automake version $am_version found. echoYou need automake version 1.4 or newer installed @@ -42,7 +43,7 @@ exit 1 fi lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'` -IFS=.; set $lt_version; IFS=' ' +IFS=.; set $lt_version; IFS=$old_IFS if test $1 -gt 1 || test $2 -gt 3 || test $2 = 3 -a $3 -ge 3 then echo buildconf: libtool version $lt_pversion (ok) @@ -88,7 +89,7 @@ autoheader # find all Makefile.ams -files=Makefile `find ap lib main modules regex os -name Makefile.am | sed 's#\.am##' | tr '\n' ' '` +files=Makefile `find ap lib main modules regex os -name Makefile.am | sed 's#\.am$##'` # suppress stupid automake warning automake --add-missing $automake_flags $files 21 | grep -v \$APACHE_OUTPUT_FILES 2
cvs commit: apache-2.0/src/lib/apr aclocal.m4 configure.in
sascha 99/12/29 15:54:28 Modified:src/lib/apr aclocal.m4 configure.in Log: Add check for socklen_t. Falls back to unsigned int. Revision ChangesPath 1.8 +26 -0 apache-2.0/src/lib/apr/aclocal.m4 Index: aclocal.m4 === RCS file: /home/cvs/apache-2.0/src/lib/apr/aclocal.m4,v retrieving revision 1.7 retrieving revision 1.8 diff -u -u -r1.7 -r1.8 --- aclocal.m41999/12/21 21:16:17 1.7 +++ aclocal.m41999/12/29 23:54:27 1.8 @@ -161,3 +161,29 @@ undefine([AC_CV_NAME])dnl ]) +dnl +dnl check for socklen_t, fall back to unsigned int +dnl + +AC_DEFUN(APR_CHECK_SOCKLEN_T,[ +AC_CACHE_CHECK(for socklen_t, ac_cv_socklen_t,[ +AC_TRY_COMPILE([ +#ifdef HAVE_SYS_TYPES_H +#include sys/types.h +#endif +#ifdef HAVE_SYS_SOCKET_H +#include sys/socket.h +#endif +],[ +socklen_t foo = (socklen_t) 0; +],[ +ac_cv_socklen_t=yes +],[ +ac_cv_socklen_t=no +]) +]) + +if test $ac_cv_socklen_t = no; then + AC_DEFINE(socklen_t, unsigned int, [Whether you have socklen_t]) +fi +]) 1.41 +2 -0 apache-2.0/src/lib/apr/configure.in Index: configure.in === RCS file: /home/cvs/apache-2.0/src/lib/apr/configure.in,v retrieving revision 1.40 retrieving revision 1.41 diff -u -u -r1.40 -r1.41 --- configure.in 1999/12/27 23:00:31 1.40 +++ configure.in 1999/12/29 23:54:27 1.41 @@ -306,6 +306,8 @@ AC_FUNC_MMAP AC_FUNC_SETPGRP +APR_CHECK_SOCKLEN_T + if test $ac_cv_func_mmap_fixed_mapped = yes; then mmap=1 AC_SUBST(mmap)
cvs commit: apache-2.0/src/lib/apr/network_io/unix networkio.h
sascha 99/12/29 15:56:25 Modified:src/lib/apr/network_io/unix networkio.h Log: Use correct data type for socket address length. Revision ChangesPath 1.13 +1 -1 apache-2.0/src/lib/apr/network_io/unix/networkio.h Index: networkio.h === RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/networkio.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -u -r1.12 -r1.13 --- networkio.h 1999/12/14 18:11:08 1.12 +++ networkio.h 1999/12/29 23:56:24 1.13 @@ -111,7 +111,7 @@ int socketdes; struct sockaddr_in *local_addr; struct sockaddr_in *remote_addr; -size_t addr_len; +socklen_t addr_len; int timeout; #ifndef HAVE_POLL int connected;
cvs commit: apache-2.0/src/modules/mpm/prefork prefork.c
sascha 99/12/29 15:57:57 Modified:src/modules/mpm/prefork prefork.c Log: Fall back to save values for SHM_R and SHM_W, if the system does not define them. Revision ChangesPath 1.61 +13 -0 apache-2.0/src/modules/mpm/prefork/prefork.c Index: prefork.c === RCS file: /home/cvs/apache-2.0/src/modules/mpm/prefork/prefork.c,v retrieving revision 1.60 retrieving revision 1.61 diff -u -u -r1.60 -r1.61 --- prefork.c 1999/12/15 21:39:08 1.60 +++ prefork.c 1999/12/29 23:57:53 1.61 @@ -105,7 +105,20 @@ #include sys/types.h #include sys/ipc.h #include sys/shm.h + +/* some systems do not define SHM_[RW]; values are from Unix98 */ + +#ifndef SHM_R +#define SHM_R 0x400 #endif + +#ifndef SHM_W +#define SHM_W 0x200 +#endif + +#endif + + #ifdef HAVE_BSTRING_H #include bstring.h /* for IRIX, FD_SET calls bzero() */
