From 766b60213d79261d0c7fa198d2ab09a8e5568ef4 Mon Sep 17 00:00:00 2001
From: Ryan Bloom <rbb@apache.org>
Date: Wed, 28 Jun 2000 16:31:02 +0000
Subject: [PATCH] Finish the Configuration cleanup.  This basically merges all
 of the autoconf scripts that APR provides for other programs into
 apr_common.m4. Other programs can then just include that file to get the APR
 checks that are required. Submitted by:	Sascha Schumann
 <sascha@schumann.cx>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85725 13f79535-47bb-0310-9956-ffa450edef68
---
 acinclude.m4    | 33 +--------------------------------
 build/build2.mk |  4 ++--
 configure.in    |  2 +-
 3 files changed, 4 insertions(+), 35 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index d66c907335..44108e863e 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -168,7 +168,7 @@ AC_DEFUN(APACHE_ONCE,[
   fi
 ])
 
-sinclude(lib/apr/threads.m4)
+sinclude(lib/apr/apr_common.m4)
 sinclude(lib/apr/hints.m4)
 
 dnl
@@ -408,34 +408,3 @@ AC_ARG_ENABLE(modules,
 ])
 ])dnl
 
-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 $apache_config_subdirs|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`
-changequote([, ])dnl
-
-  # Make the cache file name correct relative to the subdirectory.
-  case "$cache_file" in
-  /*) ac_sub_cache_file=$cache_file ;;
-  *) # Relative path.
-    ac_sub_cache_file="$ac_dots$cache_file" ;;
-  esac
-
-  # The eval makes quoting arguments work.
-
-  if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir
-  then :
-    echo "$1 configured properly"
-  else
-    echo "configure failed for $1"
-  fi
-
-  cd $ac_popdir
-])
-
diff --git a/build/build2.mk b/build/build2.mk
index 2e68351d15..1a9d51e123 100644
--- a/build/build2.mk
+++ b/build/build2.mk
@@ -81,7 +81,7 @@ all: $(targets)
 
 libtool_m4 = $(libtool_prefix)/share/aclocal/libtool.m4
 
-aclocal.m4: acinclude.m4 lib/apr/threads.m4 lib/apr/hints.m4 $(libtool_m4)
+aclocal.m4: acinclude.m4 lib/apr/apr_common.m4 lib/apr/hints.m4 $(libtool_m4)
 	@echo rebuilding $@
 	@cat acinclude.m4 $(libtool_m4) > $@
 
@@ -108,7 +108,7 @@ $(apr_private.h_in): $(apr_configure) lib/apr/acconfig.h
 	@rm -f $@
 	(cd lib/apr && autoheader)
 
-$(apr_configure): lib/apr/aclocal.m4 lib/apr/configure.in lib/apr/threads.m4 lib/apr/hints.m4
+$(apr_configure): lib/apr/aclocal.m4 lib/apr/configure.in lib/apr/apr_common.m4 lib/apr/hints.m4
 	@echo rebuilding $@
 	(cd lib/apr && autoconf)
 
diff --git a/configure.in b/configure.in
index c47350d5bb..fe7e37dc81 100644
--- a/configure.in
+++ b/configure.in
@@ -163,7 +163,7 @@ 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)
+RUN_SUBDIR_CONFIG_NOW(lib/apr)
 . ./lib/apr/APRVARS
 
 APACHE_GEN_CONFIG_VARS
-- 
2.40.0