You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@apache.org on 2001/04/03 20:37:18 UTC
cvs commit: httpd-2.0/server/mpm/threaded config5.m4 config.m4
rbb 01/04/03 11:37:18
Modified: . configure.in
server/mpm config.m4
Added: server/mpm/perchild config5.m4
server/mpm/spmt_os2 config5.m4
server/mpm/threaded config5.m4
Removed: server/mpm/perchild config.m4
server/mpm/spmt_os2 config.m4
server/mpm/threaded config.m4
Log:
Make Apache check APR's configuration when determining the default MPM.
This way, if APR is built without threads, then Apache defaults to the
prefork MPM.
Revision Changes Path
1.139 +6 -12 httpd-2.0/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/httpd-2.0/configure.in,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -d -b -w -u -r1.138 -r1.139
--- configure.in 2001/04/03 05:51:20 1.138
+++ configure.in 2001/04/03 18:37:03 1.139
@@ -21,6 +21,12 @@
sinclude(hints.m4)
sinclude(acinclude.m4)
+dnl ## Run configure for packages Apache uses
+APR_SUBDIR_CONFIG(srclib/apr, "$apache_apr_flags --disable-shared")
+APR_SUBDIR_CONFIG(srclib/apr-util, "--with-apr=../apr --disable-shared")
+APR_SUBDIR_CONFIG(srclib/pcre)
+. ./srclib/apr/APRVARS
+
dnl Generate ./config.nice for reproducing runs of configure
dnl
APR_CONFIG_NICE(config.nice)
@@ -267,18 +273,6 @@
if test -d ./test; then
APACHE_FAST_OUTPUT(test/Makefile)
fi
-
-dnl ## Run configure for packages Apache uses
-dnl ## This has been placed at this location for a reason. This allows
-dnl ## Apache to set some variable that APR needs (like whether to enable
-dnl ## or disable threads), while still allowing APR to run and generate
-dnl ## APRVARS before Apache generates it's Makefiles and the related files.
-dnl ## This allows APR to detect libraries like dl and tell Apache that it
-dnl ## needs to include or not include them.
-APR_SUBDIR_CONFIG(srclib/apr, "$apache_apr_flags --disable-shared")
-APR_SUBDIR_CONFIG(srclib/apr-util, "--with-apr=../apr --disable-shared")
-APR_SUBDIR_CONFIG(srclib/pcre)
-. ./srclib/apr/APRVARS
dnl get the exported vars from APRUTIL
. ./srclib/apr-util/export_vars.sh
1.34 +3 -15 httpd-2.0/server/mpm/config.m4
Index: config.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/config.m4,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -b -w -u -r1.33 -r1.34
--- config.m4 2001/02/21 11:46:41 1.33
+++ config.m4 2001/04/03 18:37:07 1.34
@@ -13,12 +13,10 @@
apache_cv_mpm=$APACHE_MPM
if test "$apache_cv_mpm" = "threaded" -o "$apache_cv_mpm" = "perchild"; then
- APR_PTHREADS_CHECK
- AC_MSG_CHECKING([for which threading library to use])
- AC_MSG_RESULT($threads_result)
+ APR_CHECK_APR_DEFINE(APR_HAS_THREADS, srclib/apr)
- if test "$pthreads_working" = "no"; then
- AC_MSG_RESULT(The currently selected MPM requires pthreads which your system seems to lack)
+ if test "x$ac_cv_define_APR_HAS_THREADS" = "xno"; then
+ AC_MSG_RESULT(The currently selected MPM requires threads which your system seems to lack)
AC_MSG_CHECKING(checking for replacement)
AC_MSG_RESULT(prefork selected)
apache_cv_mpm=prefork
@@ -34,13 +32,3 @@
APACHE_SUBST(MPM_NAME)
MODLIST="$MODLIST mpm_${MPM_NAME}"
-dnl Check for pthreads and attempt to support it
-AC_DEFUN(APACHE_MPM_PTHREAD, [
- if test "$pthreads_working" != "yes"; then
- AC_MSG_ERROR(This MPM requires pthreads. Try --with-mpm=prefork.)
- fi
-
- dnl User threads libraries need pthread.h included everywhere
- AC_DEFINE(PTHREAD_EVERYWHERE,,
- [Define if all code should have #include <pthread.h>])
-])
1.1 httpd-2.0/server/mpm/perchild/config5.m4
Index: config5.m4
===================================================================
dnl ## XXX - Need a more thorough check of the proper flags to use
if test "$MPM_NAME" = "perchild" ; then
APACHE_FAST_OUTPUT(server/mpm/$MPM_NAME/Makefile)
fi
1.1 httpd-2.0/server/mpm/spmt_os2/config5.m4
Index: config5.m4
===================================================================
if test "$MPM_NAME" = "spmt_os2" ; then
AC_CACHE_SAVE
APACHE_FAST_OUTPUT(server/mpm/$MPM_NAME/Makefile)
CFLAGS="$CFLAGS -Zmt"
LDFLAGS="$LDFLAGS -Zmt"
fi
1.1 httpd-2.0/server/mpm/threaded/config5.m4
Index: config5.m4
===================================================================
dnl ## XXX - Need a more thorough check of the proper flags to use
if test "$MPM_NAME" = "threaded" ; then
APACHE_FAST_OUTPUT(server/mpm/$MPM_NAME/Makefile)
fi