rse 99/09/12 05:12:05
Modified: src/lib/apr configure.in
src/lib/apr/include apr_config.h.in
src/lib/apr/misc/unix start.c
Log:
Make sure one can compile a server with MPM prefork if no pthread library is
used (even when it exists). Please be careful, never use a feature test macro
for a header to imply that one then can use a function usually defined in this
header. You explicitly have to test for the availability of the function.
Revision Changes Path
1.11 +1 -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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- configure.in 1999/09/11 11:49:31 1.10
+++ configure.in 1999/09/12 12:12:00 1.11
@@ -196,6 +196,7 @@
AC_MSG_RESULT([$msg])
dnl Checks for library functions.
+AC_CHECK_FUNCS(pthread_sigmask)
AC_CHECK_FUNCS(strcasecmp stricmp poll setsid)
AC_CHECK_FUNCS(sigaction writev)
AC_CHECK_FUNCS(getpass)
1.7 +3 -0 apache-2.0/src/lib/apr/include/apr_config.h.in
Index: apr_config.h.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_config.h.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- apr_config.h.in 1999/09/01 19:01:58 1.6
+++ apr_config.h.in 1999/09/12 12:12:00 1.7
@@ -106,6 +106,9 @@
/* Define if you have the poll function. */
#undef HAVE_POLL
+/* Define if you have the pthread_sigmask function. */
+#undef HAVE_PTHREAD_SIGMASK
+
/* Define if you have the setsid function. */
#undef HAVE_SETSID
1.5 +1 -1 apache-2.0/src/lib/apr/misc/unix/start.c
Index: start.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/unix/start.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- start.c 1999/09/12 11:12:53 1.4
+++ start.c 1999/09/12 12:12:03 1.5
@@ -161,7 +161,7 @@
*/
ap_status_t ap_initialize(void)
{
-#ifdef HAVE_PTHREAD_H
+#ifdef HAVE_PTHREAD_SIGMASK
sigset_t sigset;
sigfillset(&sigset);
