Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm
Precedence: bulk
Reply-To: new-httpd@apache.org
Date: 20 Feb 2001 02:01:09 -0000
Message-ID: <20010220020109.7124.qmail@apache.org>
From: fielding@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/server/mpm config.m4

fielding    01/02/19 18:01:09

  Modified:    .        configure.in
               server/mpm config.m4
  Log:
  Update APR macro usage to new name-protected names.
  Replace REENTRANCY_FLAGS with direct use of THREAD_CPPFLAGS.
  This is a temporary band-aid, since the way we currently set
  the standard make vars (CFLAGS, CPPFLAGS, LDFLAGS, etc.) is
  bogus and frequently redundant [to be fixed later].
  
  Revision  Changes    Path
  1.124     +12 -4     httpd-2.0/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/configure.in,v
  retrieving revision 1.123
  retrieving revision 1.124
  diff -u -r1.123 -r1.124
  --- configure.in	2001/02/18 16:07:31	1.123
  +++ configure.in	2001/02/20 02:01:09	1.124
  @@ -56,7 +56,15 @@
   AC_CHECK_TOOL(RANLIB, ranlib, true)
   dnl AC_PATH_PROG(PERL_PATH, perl)
   
  -REENTRANCY_FLAGS
  +#
  +# Play with CPPFLAGS given what was learned from APR_PRELOAD.
  +#
  +# XXX: APR only sets this if threads are enabled.  Either APR should be
  +# fixed to always set it (most likely), or we should test for threads.
  +#
  +if test -n "$THREAD_CPPFLAGS"; then
  +    CPPFLAGS="$CPPFLAGS $THREAD_CPPFLAGS"
  +fi
   
   dnl various OS checks that apparently set required flags
   AC_AIX
  @@ -243,9 +251,9 @@
   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(srclib/apr, "$apache_apr_flags --disable-shared")
  -RUN_SUBDIR_CONFIG_NOW(srclib/apr-util, "--with-apr=../apr --disable-shared")
  -RUN_SUBDIR_CONFIG_NOW(srclib/pcre)
  +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
  
  
  
  1.32      +1 -1      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.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- config.m4	2001/02/16 19:00:10	1.31
  +++ config.m4	2001/02/20 02:01:09	1.32
  @@ -13,7 +13,7 @@
   apache_cv_mpm=$APACHE_MPM
   	
   if test "$apache_cv_mpm" = "threaded" -o "$apache_cv_mpm" = "perchild"; then
  -  PTHREADS_CHECK
  +  APR_PTHREADS_CHECK
     AC_MSG_CHECKING([for which threading library to use])
     AC_MSG_RESULT($threads_result)