From 74ba5a389528eb7bbf4d1ae1bafe1980e578d052 Mon Sep 17 00:00:00 2001
From: Ryan Bloom <rbb@apache.org>
Date: Tue, 27 Jun 2000 23:12:23 +0000
Subject: [PATCH] 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
---
 acinclude.m4 |  3 ++-
 configure.in | 14 ++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 3c217e3636..d66c907335 100644
--- 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 0c53b219e6..2946d8611b 100644
--- 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.
-- 
2.40.0