rasmus 99/12/24 10:40:27
Modified: src acinclude.m4 configure.in
src/include ap_config.h
Log:
Submitted by: Sascha Schumann <[EMAIL PROTECTED]>
Reviewed by: Rasmus Lerdorf
- INADDR_NONE is not defined. Supply a replacement
- APACHE_MODULE() used a non-portable shell construct
- inet_addr() needs -lnsl -lsocket. Neccessary checks added
- For POSIX conformance, _POSIX_PTHREAD_SEMANTICS is
required. This fixes i.e. sigwait() problems.
Revision Changes Path
1.10 +23 -2 apache-2.0/src/acinclude.m4
Index: acinclude.m4
===================================================================
RCS file: /home/cvs/apache-2.0/src/acinclude.m4,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- acinclude.m4 1999/12/24 18:31:08 1.9
+++ acinclude.m4 1999/12/24 18:40:26 1.10
@@ -12,7 +12,7 @@
if test -d "$cwd/$srcdir/modules/standard" ; then
dnl MOD_SUBDIRS="$MOD_SUBDIRS $1"
if test "$2" != "shared" -a "$2" != "yes"; then
- libname=$(basename $1)
+ libname="`basename $1`"
_extlib="libapachemod_${libname}.a"
MOD_LTLIBS="$MOD_LTLIBS modules/standard/libapachemod_${libname}.la"
MOD_LIBS="$MOD_LIBS standard/$_extlib"
@@ -137,4 +137,25 @@
threads_result="Threads not found"
done
] )
-
+
+dnl
+dnl APACHE_INADDR_NONE
+dnl
+dnl checks for missing INADDR_NONE macro
+dnl
+AC_DEFUN(APACHE_INADDR_NONE,[
+ AC_TRY_COMPILE([
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+],[
+unsigned long foo = INADDR_NONE;
+],[
+ HAVE_INADDR_NONE=yes
+],[
+ HAVE_INADDR_NONE=no
+ AC_DEFINE(INADDR_NONE, ((unsigned int) 0xffffffff), [ ])
+])
+ AC_MSG_CHECKING(whether system defines INADDR_NONE)
+ AC_MSG_RESULT($HAVE_INADDR_NONE)
+])
1.17 +10 -0 apache-2.0/src/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/configure.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- configure.in 1999/12/24 18:31:09 1.16
+++ configure.in 1999/12/24 18:40:26 1.17
@@ -88,9 +88,19 @@
bzero \
)
+AC_CHECK_LIB(nsl, gethostbyname)
+AC_CHECK_LIB(socket, socket)
+
AC_CHECK_FUNCS(inet_addr inet_network, break, [
AC_MSG_ERROR(inet_addr function not found)
])
+
+APACHE_INADDR_NONE
+
+case "`uname -sr`" in
+"SunOS 5"*)
+ CFLAGS="$CFLAGS -D_POSIX_PTHREAD_SEMANTICS";;
+esac
AC_FUNC_SELECT_ARGTYPES
1.14 +3 -0 apache-2.0/src/include/ap_config.h
Index: ap_config.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/include/ap_config.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ap_config.h 1999/12/04 02:56:18 1.13
+++ ap_config.h 1999/12/24 18:40:27 1.14
@@ -195,6 +195,9 @@
int gethostname(char *name, int namelen);
#define HAVE_SYSLOG 1
#define SYS_SIGLIST _sys_siglist
+#ifndef INADDR_NONE
+#define INADDR_NONE ((unsigned int) 0xffffffff)
+#endif
#elif defined(IRIX)
#undef HAVE_GMTOFF
