trawick 01/02/27 05:09:25
Modified: . configure.in
threadproc/unix signals.c
Log:
Get APR to build on Tru64 again.
1) Move sendfile-disable logic to a point after we set the sendfile
shell variable. It was broken before, from Sunday when I moved the
thread configuration to a point earlier in the APR configure
procedure.
2) (!!!!!!!!!DEFINITELY FIXME!!!!!!!)
Work around a problem with APR_FLAG_HEADERS on Tru64 by adding
additional, separate invocations of APR_FLAG_HEADERS() for header
files which were not handled properly.
3) (!!!!!!WOULD BE NICE TO AUTODETECT!!!!!!!)
Work around a problem where the presence of sigwait() isn't detected.
sigwait() is renamed in a system header file, but the normal
autoconf way to detect functions has no provision for including
header files.
Also, some empty lines in the invocation of APR_FLAG_HEADERS were removed.
They had to impact on processing, but they didn't look nice.
Revision Changes Path
1.250 +41 -30 apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr/configure.in,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -r1.249 -r1.250
--- configure.in 2001/02/27 11:34:46 1.249
+++ configure.in 2001/02/27 13:09:24 1.250
@@ -222,35 +222,16 @@
fi
AC_CHECK_FUNCS(sigwait, [ have_sigwait="1" ], [ have_sigwait="0" ])
-
-AC_SUBST(threads)
-AC_SUBST(have_sigwait)
-
-dnl THIS MUST COME AFTER THE THREAD TESTS - FreeBSD doesn't always have a
-dnl threaded poll() and we don't want to use sendfile on early FreeBSD
-dnl systems if we are also using threads.
-
-orig_sendfile=$sendfile
+dnl AC_CHECK_FUNCS doesn't work for this on Tru64 since the function
+dnl is renamed in signal.h. Todo: Autodetect
case "$OS" in
- *freebsd*)
- if test $os_version -le "410"; then
- if test "$threads" = "1"; then
- sendfile="0"
- fi
- fi
- ;;
*alpha*-dec-osf* )
- sendfile="0"
+ have_sigwait="1"
;;
- s390-*-linux-gnu)
- sendfile="0"
- ;;
-esac
-if test "$orig_sendfile" != "$sendfile"; then
- echo "sendfile support disabled to avoid system problem"
-fi
-AC_SUBST(sendfile)
+esac
+AC_SUBST(threads)
+AC_SUBST(have_sigwait)
AC_CHECK_FUNCS(poll)
@@ -365,6 +346,31 @@
sendfile="0"
AC_CHECK_FUNCS(sendfile send_file, [ sendfile="1" ])
+dnl THIS MUST COME AFTER THE THREAD TESTS - FreeBSD doesn't always have a
+dnl threaded poll() and we don't want to use sendfile on early FreeBSD
+dnl systems if we are also using threads.
+
+orig_sendfile=$sendfile
+case "$OS" in
+ *freebsd*)
+ if test $os_version -le "410"; then
+ if test "$threads" = "1"; then
+ sendfile="0"
+ fi
+ fi
+ ;;
+ *alpha*-dec-osf* )
+ sendfile="0"
+ ;;
+ s390-*-linux-gnu)
+ sendfile="0"
+ ;;
+esac
+if test "$orig_sendfile" != "$sendfile"; then
+ echo "sendfile support disabled to avoid system problem"
+fi
+AC_SUBST(sendfile)
+
AC_CHECK_FUNCS(sigaction, [ have_sigaction="1" ], [ have_sigaction="0" ])
AC_DECL_SYS_SIGLIST
@@ -440,16 +446,11 @@
tpfio.h \
unistd.h \
unix.h \
- \
arpa/inet.h \
- \
kernel/OS.h \
- \
net/errno.h \
- \
netinet/in.h \
netinet/tcp.h \
- \
sys/file.h \
sys/mman.h \
sys/poll.h \
@@ -465,6 +466,16 @@
sys/types.h \
sys/uio.h \
sys/wait.h)
+
+dnl work around unexplained problem on Tru64 where
+dnl the above invocation says it finds the header but
+dnl APR_HAVE_foo_H is 0
+APR_FLAG_HEADERS(stdio.h)
+APR_FLAG_HEADERS(errno.h)
+APR_FLAG_HEADERS(crypt.h)
+APR_FLAG_HEADERS(ctype.h)
+APR_FLAG_HEADERS(fcntl.h)
+APR_FLAG_HEADERS(netdb.h)
AC_SUBST(arpa_ineth)
AC_SUBST(conioh)
1.26 +1 -1 apr/threadproc/unix/signals.c
Index: signals.c
===================================================================
RCS file: /home/cvs/apr/threadproc/unix/signals.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- signals.c 2001/02/25 20:39:39 1.25
+++ signals.c 2001/02/27 13:09:25 1.26
@@ -267,7 +267,7 @@
#endif /* SYS_SIGLIST_DECLARED */
-#if APR_HAS_THREADS && !defined(OS2) && defined(HAVE_SIGWAIT)
+#if APR_HAS_THREADS && !defined(OS2) && APR_HAVE_SIGWAIT
static void *signal_thread_func(void *signal_handler)
{
sigset_t sig_mask;
