summaryrefslogtreecommitdiffstats
path: root/srclib/Makefile.in
diff options
context:
space:
mode:
authorJustin Erenkrantz <jerenkrantz@apache.org>2002-05-13 10:39:30 +0200
committerJustin Erenkrantz <jerenkrantz@apache.org>2002-05-13 10:39:30 +0200
commit12921bc4fd38e26b303316bbea006a73dc40b0a5 (patch)
treee1447ea21184e729ac74693c05dfe72fa1e075d8 /srclib/Makefile.in
parentCorrect typo in last commit. (diff)
downloadapache2-12921bc4fd38e26b303316bbea006a73dc40b0a5.tar.xz
apache2-12921bc4fd38e26b303316bbea006a73dc40b0a5.zip
First pass at trying to standardize httpd-2.0's usage of APR and APR-util
so that they can be separated - use an installed APR and APR-util with httpd-2.0. This is not expected to achieve full separation, but is merely the first step in the process. The tree should still be buildable in the source-only case. This commit does the following things: - Use the standard find_apr.m4 and find_apu.m4 m4 macro files that flood and Subversion already use for locating APR and APR-util. This adds the --with-apr and --with-apr-util configure options. - Stop using APRVARS and export_vars.sh. - Use apr-config and apu-config to determine dependencies. - Add AP_BUILD_SRCLIB_DIRS and AP_CLEAN_SRCLIB_DIRS values (names stink) to dynamically figure out what subdirs in srclib we will build. (What we really want to do is set one value - go L->R on build and R->L on clean. I can't think of a way to do this.) - If we are using APR and APR-util that are already installed, don't specify them in srclib. (This still needs some work I bet.) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95061 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'srclib/Makefile.in')
-rw-r--r--srclib/Makefile.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/srclib/Makefile.in b/srclib/Makefile.in
index 379ade4277..1fb910ad32 100644
--- a/srclib/Makefile.in
+++ b/srclib/Makefile.in
@@ -1,6 +1,6 @@
SUBDIRS = pcre
-BUILD_SUBDIRS = apr apr-util
-CLEAN_SUBDIRS = apr-util apr
+BUILD_SUBDIRS = $(AP_BUILD_SRCLIB_DIRS)
+CLEAN_SUBDIRS = $(AP_CLEAN_SRCLIB_DIRS)
include $(top_builddir)/build/rules.mk