httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@hyperreal.org
Subject cvs commit: apache-2.0/src/modules/mpm/mpmt_pthread config.m4
Date Wed, 22 Dec 1999 21:24:48 GMT
rbb         99/12/22 13:24:47

  Modified:    src/lib/apr configure.in
               src/modules/mpm/dexter config.m4
               src/modules/mpm/mpmt_pthread config.m4
  Log:
  This fixes the bug in my last commit.  Apache always caches a value for
  enable-threads.  This allows us to re-configure the server for different
  MPM's without worrying about not having APR-threads available.
  
  Revision  Changes    Path
  1.39      +12 -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.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- configure.in	1999/12/22 20:29:16	1.38
  +++ configure.in	1999/12/22 21:24:42	1.39
  @@ -45,6 +45,18 @@
       pthreadh="0"
   else
       if test "$ac_cv_enable_threads" = "pthread"; then
  +# We have specified pthreads for our threading library, just make sure
  +# that we have everything we need
  +      AC_CHECK_HEADERS(pthread.h, [ 
  +          threads="1"
  +          pthreadh="1"
  +          AC_DEFINE(USE_THREADS) ], [
  +          threads="0"
  +          pthreadh="0" ] )
  +    else
  +# We basically specified that we wanted threads, but not how to implement
  +# them.  In this case, just look for pthreads.  In the future, we can check
  +# for other threading libraries as well.
         AC_CHECK_HEADERS(pthread.h, [ 
             threads="1"
             pthreadh="1"
  
  
  
  1.2       +3 -0      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- config.m4	1999/11/29 23:46:38	1.1
  +++ config.m4	1999/12/22 21:24:44	1.2
  @@ -1,6 +1,9 @@
   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_OUTPUT(modules/mpm/$MPM_NAME/Makefile)
       APACHE_MPM_PTHREAD
       APACHE_MPM_CHECK_SHMEM
  
  
  
  1.3       +3 -0      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- config.m4	1999/11/30 03:52:41	1.2
  +++ config.m4	1999/12/22 21:24:45	1.3
  @@ -1,6 +1,9 @@
   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_OUTPUT(modules/mpm/$MPM_NAME/Makefile)
   
       APACHE_MPM_PTHREAD
  
  
  

Mime
View raw message