You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by gs...@locus.apache.org on 2000/11/02 04:30:40 UTC
cvs commit: apache-2.0/src/modules/mpm/prefork config.m4
gstein 00/11/01 19:30:37
Modified: src configure.in
src/lib/apr configure.in
src/modules/mpm/beos config.m4
src/modules/mpm/dexter config.m4
src/modules/mpm/mpmt_beos config.m4
src/modules/mpm/mpmt_pthread config.m4
src/modules/mpm/perchild config.m4
src/modules/mpm/prefork config.m4
Log:
Simplify the configuration mechanisms for threading in APR.
Revise how Apache configs APR and allow MPMs (or other config scripts) to
pass cmd line params down to APR. For the MPMs that specifically require
or disallow threads, have them force APR threads on/off.
Submitted by: Joe Orton <jo...@light.plus.com>
Reviewed by: Greg Stein
Revision Changes Path
1.83 +1 -1 apache-2.0/src/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/configure.in,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- configure.in 2000/10/27 21:54:28 1.82
+++ configure.in 2000/11/02 03:30:23 1.83
@@ -205,7 +205,7 @@
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.
-RUN_SUBDIR_CONFIG_NOW(lib/apr)
+RUN_SUBDIR_CONFIG_NOW(lib/apr, $apache_apr_flags)
RUN_SUBDIR_CONFIG_NOW(lib/pcre)
. ./lib/apr/APRVARS
1.163 +13 -15 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.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- configure.in 2000/10/25 12:56:00 1.162
+++ configure.in 2000/11/02 03:30:26 1.163
@@ -92,13 +92,13 @@
CFLAGS="$CFLAGS -DOS2 -Zmt"
OSDIR="os2"
LIBPREFIX=""
- enable_apr_threads="system_threads"
+ enable_threads="system_threads"
eolstr="\\r\\n"
;;
*beos*)
OSDIR="beos"
CFLAGS="$CFLAGS -DBEOS"
- enable_apr_threads="system_threads"
+ enable_threads="system_threads"
config_subdirs="shmem/unix/mm"
native_mmap_emul="1"
USE_MM=yes
@@ -121,10 +121,6 @@
AC_SUBST(eolstr)
-if test "$enable_apr_threads" = "system_threads"; then
- ac_cv_enable_threads="yes"
-fi
-
dnl #----------------------------- Checking for Shared Memory Support
echo $ac_n "${nl}Checking for Shared Memory Support...${nl}"
@@ -476,21 +472,23 @@
dnl #----------------------------- Checking for Threads
echo $ac_n "${nl}Checking for Threads...${nl}"
-AC_CACHE_CHECK([for threads], ac_cv_enable_threads,
- [ AC_ARG_ENABLE(threads,
- [ --enable-threads Enable threading support in APR.],
- [ ac_cv_enable_threads=$enableval] ,
- [ CHECK_PTHREADS_H([ ac_cv_enable_threads="pthread" ] ,
- [ ac_cv_enable_threads="no" ] ) ] ) ] )
+
+if test -z "$enable_threads"; then
+ AC_ARG_ENABLE(threads,
+ [ --enable-threads Enable threading support in APR.],
+ [ enable_threads=$enableval] ,
+ [ CHECK_PTHREADS_H([ enable_threads="pthread" ] ,
+ [ enable_threads="no" ] ) ] )
+fi
-if test "$ac_cv_enable_threads" = "no"; then
+if test "$enable_threads" = "no"; then
echo "Don't enable threads"
threads="0"
pthreadh="0"
pthreadser="0"
else
REENTRANCY_FLAGS
- if test "$ac_cv_enable_threads" = "pthread"; then
+ if test "$enable_threads" = "pthread"; then
# We have specified pthreads for our threading library, just make sure
# that we have everything we need
PTHREADS_CHECK
@@ -502,7 +500,7 @@
threads="0"
pthreadh="0"
pthreadser="0" ] )
- elif test "$enable_apr_threads" = "system_threads"; then
+ elif test "$enable_threads" = "system_threads"; then
threads="1"
pthreadh="0"
pthreadser="0"
1.2 +1 -2 apache-2.0/src/modules/mpm/beos/config.m4
Index: config.m4
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/beos/config.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config.m4 2000/06/20 14:30:00 1.1
+++ config.m4 2000/11/02 03:30:27 1.2
@@ -1,8 +1,7 @@
dnl ## XXX - Need a more thorough check of the proper flags to use
if test "$MPM_NAME" = "beos" ; then
- ac_cv_enable_threads="yes"
- AC_CACHE_SAVE
+ apache_apr_flags="--enable-threads"
APACHE_FAST_OUTPUT(modules/mpm/$MPM_NAME/Makefile)
fi
1.5 +1 -2 apache-2.0/src/modules/mpm/dexter/config.m4
Index: config.m4
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/config.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- config.m4 2000/06/13 01:08:19 1.4
+++ config.m4 2000/11/02 03:30:29 1.5
@@ -1,8 +1,7 @@
dnl ## XXX - Need a more thorough check of the proper flags to use
if test "$MPM_NAME" = "dexter" ; then
- ac_cv_enable_threads="yes"
- AC_CACHE_SAVE
+ apache_apr_flags="--enable-threads"
APACHE_FAST_OUTPUT(modules/mpm/$MPM_NAME/Makefile)
APACHE_MPM_PTHREAD
1.2 +1 -2 apache-2.0/src/modules/mpm/mpmt_beos/config.m4
Index: config.m4
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_beos/config.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config.m4 2000/02/07 12:02:59 1.1
+++ config.m4 2000/11/02 03:30:30 1.2
@@ -1,8 +1,7 @@
dnl ## XXX - Need a more thorough check of the proper flags to use
if test "$MPM_NAME" = "mpmt_beos" ; then
- ac_cv_enable_threads="yes"
- AC_CACHE_SAVE
+ apache_apr_flags="--enable-threads"
APACHE_FAST_OUTPUT(modules/mpm/$MPM_NAME/Makefile)
fi
1.8 +1 -2 apache-2.0/src/modules/mpm/mpmt_pthread/config.m4
Index: config.m4
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/config.m4,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- config.m4 2000/08/02 00:56:28 1.7
+++ config.m4 2000/11/02 03:30:31 1.8
@@ -1,8 +1,7 @@
dnl ## XXX - Need a more thorough check of the proper flags to use
if test "$MPM_NAME" = "mpmt_pthread" ; then
- ac_cv_enable_threads="yes"
- AC_CACHE_SAVE
+ apache_apr_flags="--enable-threads"
APACHE_FAST_OUTPUT(modules/mpm/$MPM_NAME/Makefile)
1.2 +1 -2 apache-2.0/src/modules/mpm/perchild/config.m4
Index: config.m4
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/perchild/config.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config.m4 2000/07/27 00:16:31 1.1
+++ config.m4 2000/11/02 03:30:34 1.2
@@ -1,8 +1,7 @@
dnl ## XXX - Need a more thorough check of the proper flags to use
if test "$MPM_NAME" = "perchild" ; then
- ac_cv_enable_threads="yes"
- AC_CACHE_SAVE
+ apache_apr_flags="--enable-threads"
APACHE_FAST_OUTPUT(modules/mpm/$MPM_NAME/Makefile)
APACHE_MPM_PTHREAD
1.6 +1 -2 apache-2.0/src/modules/mpm/prefork/config.m4
Index: config.m4
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/prefork/config.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- config.m4 2000/06/13 01:08:20 1.5
+++ config.m4 2000/11/02 03:30:36 1.6
@@ -1,7 +1,6 @@
if test "$MPM_NAME" = "prefork" ; then
dnl Turn off all threading functions in APR
- ac_cv_enable_threads="no"
- AC_CACHE_SAVE
+ apache_apr_flags="--disable-threads"
APACHE_FAST_OUTPUT(modules/mpm/$MPM_NAME/Makefile)
Re: BeOS MPMs (was: Re: cvs commit: ...)
Posted by David Reid <dr...@jetnet.co.uk>.
One of them is going away real soon now :)
david
----- Original Message -----
From: "Greg Stein" <gs...@lyra.org>
To: <ne...@apache.org>
Sent: Thursday, November 02, 2000 3:37 AM
Subject: BeOS MPMs (was: Re: cvs commit: ...)
> On Thu, Nov 02, 2000 at 03:30:40AM -0000, gstein@locus.apache.org wrote:
> > gstein 00/11/01 19:30:37
> >
> > Modified: src configure.in
> > src/lib/apr configure.in
> > src/modules/mpm/beos config.m4
> > src/modules/mpm/dexter config.m4
> > src/modules/mpm/mpmt_beos config.m4
>
> One thing about this change: why are there two BeOS MPMs? David?
>
> Cheers,
> -g
>
> --
> Greg Stein, http://www.lyra.org/
>
BeOS MPMs (was: Re: cvs commit: ...)
Posted by Greg Stein <gs...@lyra.org>.
On Thu, Nov 02, 2000 at 03:30:40AM -0000, gstein@locus.apache.org wrote:
> gstein 00/11/01 19:30:37
>
> Modified: src configure.in
> src/lib/apr configure.in
> src/modules/mpm/beos config.m4
> src/modules/mpm/dexter config.m4
> src/modules/mpm/mpmt_beos config.m4
One thing about this change: why are there two BeOS MPMs? David?
Cheers,
-g
--
Greg Stein, http://www.lyra.org/