Fix the configure process. This does a couple of things to allow APR and

Apache to share information.

1)  Move the calling of APR after Apache decides which MPM is run, but
    before Apache generates the Makefiles and related files.  This allows
    Apache to setup the threading cache values, while still allowing APR
    to generate APRVARS in time for Apache to use it.

2)  Setup the cache files correctly for RUN_NOW configured subdirectories.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85714 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/acinclude.m4 b/acinclude.m4
index 3c217e3636f4a3a552236371e8c60098ec065c6d..d66c90733583e3e3e77b3b2ecc0721b0c907b610 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -412,11 +412,12 @@ AC_DEFUN(APACHE_RUN_SUBDIR_CONFIG_NOW, [
   echo "configuring package in $1 now"
   ac_popdir=`pwd`
   ac_abs_srcdir=`(cd $srcdir/$1 && pwd)`
+  apache_config_subdirs="$1"
   cd $1
 
 changequote(, )dnl
       # A "../" for each directory in /$config_subdirs.
-      ac_dots=`echo $config_subdirs|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`
+      ac_dots=`echo $apache_config_subdirs|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`
 changequote([, ])dnl
 
   # Make the cache file name correct relative to the subdirectory.

diff --git a/configure.in b/configure.in
index 0c53b219e690a3cc4329e4d67b4fc4d1638738ce..2946d8611bb8f9789711f18090e17f3121e86b81 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -34,10 +34,6 @@ dnl
 dnl ## Preload our OS configuration
 APR_PRELOAD
 
-dnl ## Run configure for packages Apache uses
-APACHE_RUN_SUBDIR_CONFIG_NOW(lib/apr)
-. ./lib/apr/APRVARS
-
 dnl ## Check for programs
 
 AC_PROG_AWK
@@ -159,6 +155,16 @@ AC_ARG_WITH(program-name,
 APACHE_FAST_OUTPUT(Makefile ap/Makefile lib/Makefile main/Makefile)
 APACHE_FAST_OUTPUT(modules/Makefile os/Makefile support/Makefile lib/pcre/Makefile)
 
+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.
+APACHE_RUN_SUBDIR_CONFIG_NOW(lib/apr)
+. ./lib/apr/APRVARS
+
 APACHE_GEN_CONFIG_VARS
 
 dnl There needs to be a .deps file in the top build directory.