httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@locus.apache.org
Subject cvs commit: apache-2.0/src/modules/standard config.m4
Date Thu, 01 Jun 2000 15:45:18 GMT
rbb         00/06/01 08:45:18

  Modified:    src/lib/apr configure.in
               src/modules/standard config.m4
  Log:
  Fix DSO enabling logic.  Basically if --enable-dso was specified on the
  command line but the cache had DSO off, we used to turn DSO off.  This has
  been fixed with this patch.  Also, if we specify ANY Apache module as
  being compiled shared, then we automatically turn on mod_so.
  
  Revision  Changes    Path
  1.96      +5 -5      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.95
  retrieving revision 1.96
  diff -u -r1.95 -r1.96
  --- configure.in	2000/06/01 01:01:12	1.95
  +++ configure.in	2000/06/01 15:45:18	1.96
  @@ -319,11 +319,11 @@
   
   dnl #----------------------------- Checking for DSO support
   echo $ac_n "${nl}Checking for DSO...${nl}"
  -AC_CACHE_CHECK([for DSO support], ac_cv_enable_dso,
  -  [ AC_ARG_ENABLE(dso,
  -    [  --enable-dso              Enable reliable child processes ],
  -    [ ac_cv_enable_dso=$enableval],
  -    [ aprdso="1" ] ) ] )
  +AC_ARG_ENABLE(dso,
  +  [  --enable-dso              Enable reliable child processes ],
  +  [ ac_cv_enable_dso=$enableval],
  +  [ AC_CACHE_CHECK([for DSO support], ac_cv_enable_dso,
  +    [ac_cv_enable_dso="yes"] ) ] )
   
   if test "$ac_cv_enable_dso" = "no"; then
       aprdso="0"
  
  
  
  1.17      +3 -1      apache-2.0/src/modules/standard/config.m4
  
  Index: config.m4
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/config.m4,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- config.m4	2000/06/01 01:01:16	1.16
  +++ config.m4	2000/06/01 15:45:18	1.17
  @@ -51,7 +51,6 @@
   ])
   
   APACHE_CHECK_STANDARD_MODULE(unique_id, per-request unique ids, , no)
  -APACHE_CHECK_STANDARD_MODULE(so, DSO capability, , no)
   APACHE_CHECK_STANDARD_MODULE(setenvif, basing ENV vars on headers, , yes)
   APACHE_CHECK_STANDARD_MODULE(echo, ECHO server, , yes)
   
  @@ -62,6 +61,9 @@
       LIBS="$LIBS -ldl"
       LTFLAGS="$LTFLAGS -export-dynamic"
       ac_cv_enable_dso="yes"
  +    APACHE_CHECK_STANDARD_MODULE(so, DSO capability, , yes)
  +else
  +    APACHE_CHECK_STANDARD_MODULE(so, DSO capability, , no)
   fi
   AC_CACHE_SAVE
       
  
  
  

Mime
View raw message