Add apr-util to the build process. This should now build once everything

has been checked out to the correct locations.

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

diff --git a/build/build2.mk b/build/build2.mk
index 76186f91648e9b2783fa8ce337813e5ea4fda2a8..efb8f6a9e005e3d8a6506e3a9d559cd71472b900 100644 (file)
--- a/build/build2.mk
+++ b/build/build2.mk
@@ -65,10 +65,11 @@ apr_private.h_in = srclib/apr/include/apr_private.h.in
 apr_configure = srclib/apr/configure
 mm_configure = srclib/apr/shmem/unix/mm/configure
 pcre_configure = srclib/pcre/configure
+aprutil_configure = srclib/apr-util/configure
 
 APACHE_TARGETS = $(TOUCH_FILES) $(LT_TARGETS) configure $(config_h_in)
 
-APR_TARGETS = $(apr_configure) $(apr_private.h_in) $(mm_configure)
+APR_TARGETS = $(apr_configure) $(apr_private.h_in) $(mm_configure) $(aprutil_configure)
 
 PCRE_TARGETS = $(pcre_configure)
 
@@ -117,6 +118,10 @@ $(apr_private.h_in): $(apr_configure) srclib/apr/acconfig.h
        @rm -f $@
        (cd srclib/apr && autoheader)
 
+$(aprutil_configure): srclib/apr-util/configure.in
+       @echo rebuilding $@
+       (cd srclib/apr-util && ./buildconf.sh)
+
 $(apr_configure): srclib/apr/aclocal.m4 srclib/apr/configure.in srclib/apr/apr_common.m4 srclib/apr/hints.m4
        @echo rebuilding $@
        (cd srclib/apr && ./buildconf)

diff --git a/configure.in b/configure.in
index d9a24851aaced2425eba57f7714090f4922f436b..7693a5409212280c6e8a509e0f70f9f47e5345b6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -225,6 +225,7 @@ 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)
+RUN_SUBDIR_CONFIG_NOW(srclib/apr-util, "--with-apr=../apr")
 RUN_SUBDIR_CONFIG_NOW(srclib/pcre)
 . ./srclib/apr/APRVARS
 

diff --git a/srclib/Makefile.in b/srclib/Makefile.in
index 1e58b2679cbd35b66786303b8df043aebfc35760..b2c3daf83d944d8d3c90222a6e300c4148db3dfd 100644 (file)
--- a/srclib/Makefile.in
+++ b/srclib/Makefile.in
@@ -1,4 +1,4 @@
 
-SUBDIRS = apr pcre $(AP_LIB_DIRS)
+SUBDIRS = apr apr-util pcre $(AP_LIB_DIRS)
 
 include $(top_srcdir)/build/rules.mk

diff --git a/support/Makefile.in b/support/Makefile.in
index 219a1de411aa744c21a43316c9558cc699dceb5c..0915fa27855a94b52aecc6f0b1826d81f7056ad4 100644 (file)
--- a/support/Makefile.in
+++ b/support/Makefile.in
@@ -4,7 +4,7 @@ targets  = $(PROGRAMS)
 
 PROGRAM_LDADD        = $(EXTRA_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS)
 PROGRAM_DEPENDENCIES = \
-       ../srclib/apr-util/libaprutil.la ../srclib/apr/$(LIBPRE)apr.a
+       ../srclib/apr-util/.libs/libaprutil.la ../srclib/apr/$(LIBPRE)apr.a
 
 include $(top_srcdir)/build/rules.mk