APRUTIL_INCLUDES now available.

todo: get httpd to link to it.


git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@58525 13f79535-47bb-0310-9956-ffa450edef68

15 files changed, 25 insertions, 13 deletions

diff --git a/Makefile.in b/Makefile.in
index a826ccf1..0737f40c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -6,7 +6,7 @@ CPP = @CPP@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
-INCLUDES=-I./include -I$(srcdir)/include @APR_INCLUDES@
+INCLUDES=-I./include -I$(srcdir)/include @APR_INCLUDES@ @APRUTIL_INCLUDES@
 
 TARGET_LIB = libaprutil.la
 INSTALL_SUBDIRS = @APR_XML_DIR@
diff --git a/apu-config.in b/apu-config.in
index 2f890f05..79e53250 100644
--- a/apu-config.in
+++ b/apu-config.in
@@ -61,6 +61,7 @@ BINDIR="@bindir@"
 LIBDIR="@libdir@"
 TOP_SRCDIR="@top_srcdir@"
 LIBS="@APRUTIL_EXPORT_LIBS@"
+INCLUDES="@APRUTIL_INCLUDES@"
 
 show_usage()
 {
@@ -69,6 +70,7 @@ Usage: apu-config [OPTION]
 
 Known values for OPTION are:
   --prefix[=DIR]    change prefix to DIR
+  --includes        print include information
   --libs            print library information
   --help            print this help
 EOF
@@ -102,6 +104,9 @@ while test $# -gt 0; do
     fi
     echo "$LIBS"
     ;;
+    --includes)
+    echo $INCLUDES
+    ;;
     --help)
     show_usage
     exit 1
diff --git a/buckets/Makefile.in b/buckets/Makefile.in
index 8b54de77..e3279fdb 100644
--- a/buckets/Makefile.in
+++ b/buckets/Makefile.in
@@ -3,7 +3,7 @@ VPATH = @srcdir@
 
 top_builddir=@top_builddir@
 top_srcdir=@abs_srcdir@
-INCLUDES=-I$(top_builddir)/include -I$(top_srcdir)/include @APR_INCLUDES@
+INCLUDES=-I$(top_builddir)/include -I$(top_srcdir)/include @APR_INCLUDES@ @APRUTIL_INCLUDES@
 
 TARGETS = apr_buckets_file.lo apr_buckets_pool.lo apr_buckets_flush.lo \
 apr_buckets_refcount.lo apr_buckets_heap.lo apr_buckets_simple.lo apr_buckets.lo \
diff --git a/build/apu-conf.m4 b/build/apu-conf.m4
index f7006cbc..f0bb5a62 100644
--- a/build/apu-conf.m4
+++ b/build/apu-conf.m4
@@ -57,6 +57,7 @@ AC_MSG_RESULT($APR_INCLUDES)
 AC_SUBST(APR_BUILD_DIR)
 AC_SUBST(APR_SOURCE_DIR)
 AC_SUBST(APR_INCLUDES)
+dnl not sure --  AC_SUBST(APRUTIL_INCLUDES)
 ])
 
 dnl
@@ -199,7 +200,7 @@ AC_ARG_WITH([gdbm],
         AC_CHECK_HEADER(gdbm.h, AC_CHECK_LIB(gdbm, gdbm_open, [apu_have_gdbm=1]))
         if test "$apu_have_gdbm" != "0"; then
             APR_ADDTO(APRUTIL_EXPORT_LIBS, [-L$withval/lib])
-            APR_ADDTO(APR_INCLUDES, [-I$withval/include])
+            APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include])
         fi
     fi
 ],[
@@ -490,7 +491,8 @@ APR_XML_DIR=$bundled_subdir
 AC_SUBST(APR_XML_SUBDIRS)
 AC_SUBST(APR_XML_DIR)
 
-APR_ADDTO(INCLUDES, [-I$expat_include_dir])
+dnl APR_ADDTO(INCLUDES, [-I$expat_include_dir])
+APR_ADDTO(APRUTIL_INCLUDES, [-I$expat_include_dir])
 APR_ADDTO(LIBS, [$expat_libs])
 APR_ADDTO(APRUTIL_EXPORT_LIBS, [$expat_libs])
 dnl ### export the Expat includes?
diff --git a/configure.in b/configure.in
index 6110a9a3..ed9c7713 100644
--- a/configure.in
+++ b/configure.in
@@ -55,6 +55,8 @@ APU_FIND_EXPAT
 
 dnl Add in the INCLUDES from APR
 APR_ADDTO(INCLUDES, [$APR_INCLUDES])
+dnl Add in the Includes from APR-UTIL
+APR_ADDTO(INCLUDES, [$APRUTIL_INCLUDES])
 so_ext=$APR_SO_EXT
 lib_target=$APR_LIB_TARGET
 AC_SUBST(so_ext)
@@ -80,8 +82,10 @@ dnl Prep all the flags and stuff for compilation and export to other builds
 dnl
 APR_ADDTO(CFLAGS, [$CFLAGS $INCLUDES $APR_EXPORT_CFLAGS $APR_EXPORT_CPPFLAGS])
 APR_ADDTO(LIBS, [$APR_EXPORT_LIBS])
+APR_ADDTO(INCLUDES, [$APRUTIL_INCLUDES])
 
 AC_SUBST(APRUTIL_EXPORT_LIBS)
+AC_SUBST(APRUTIL_INCLUDES)
 AC_SUBST(LDFLAGS)
 APR_ADDTO(LIBS,[$APRUTIL_EXPORT_LIBS])
 
diff --git a/crypto/Makefile.in b/crypto/Makefile.in
index 6021a640..9f9efb8d 100644
--- a/crypto/Makefile.in
+++ b/crypto/Makefile.in
@@ -3,7 +3,7 @@ VPATH = @srcdir@
 
 top_builddir=@top_builddir@
 top_srcdir=@abs_srcdir@
-INCLUDES=-I$(top_builddir)/include -I$(top_srcdir)/include @APR_INCLUDES@
+INCLUDES=-I$(top_builddir)/include -I$(top_srcdir)/include @APR_INCLUDES@ @APRUTIL_INCLUDES@
 
 TARGETS = apr_sha1.lo apr_md4.lo
 
diff --git a/dbm/Makefile.in b/dbm/Makefile.in
index 20edf15a..e4277e27 100644
--- a/dbm/Makefile.in
+++ b/dbm/Makefile.in
@@ -3,7 +3,7 @@ VPATH = @srcdir@
 
 top_builddir=@top_builddir@
 top_srcdir=@abs_srcdir@
-INCLUDES=-I$(top_builddir)/include -I$(top_builddir)/include/private -I$(top_srcdir)/include -I$(top_srcdir)/include/private @APR_INCLUDES@
+INCLUDES=-I$(top_builddir)/include -I$(top_builddir)/include/private -I$(top_srcdir)/include -I$(top_srcdir)/include/private @APR_INCLUDES@ @APRUTIL_INCLUDES@
 
 TARGETS = apr_dbm.lo apr_dbm_berkeleydb.lo apr_dbm_gdbm.lo apr_dbm_sdbm.lo
 
diff --git a/dbm/sdbm/Makefile.in b/dbm/sdbm/Makefile.in
index c725f37f..17d1c5e6 100644
--- a/dbm/sdbm/Makefile.in
+++ b/dbm/sdbm/Makefile.in
@@ -3,7 +3,7 @@ VPATH = @srcdir@
 
 top_builddir=@top_builddir@
 top_srcdir=@abs_srcdir@
-INCLUDES=-I$(top_builddir)/include -I$(top_srcdir)/include @APR_INCLUDES@
+INCLUDES=-I$(top_builddir)/include -I$(top_srcdir)/include @APR_INCLUDES@ @APRUTIL_INCLUDES@
 
 TARGETS = sdbm.lo sdbm_hash.lo sdbm_lock.lo sdbm_pair.lo
 
diff --git a/encoding/Makefile.in b/encoding/Makefile.in
index ee7aeeac..9571c5ad 100644
--- a/encoding/Makefile.in
+++ b/encoding/Makefile.in
@@ -3,7 +3,7 @@ VPATH = @srcdir@
 
 top_builddir=@top_builddir@
 top_srcdir=@abs_srcdir@
-INCLUDES=-I$(top_builddir)/include -I$(top_srcdir)/include @APR_INCLUDES@
+INCLUDES=-I$(top_builddir)/include -I$(top_srcdir)/include @APR_INCLUDES@ @APRUTIL_INCLUDES@
 
 TARGETS = apr_base64.lo
 
diff --git a/export_vars.sh.in b/export_vars.sh.in
index 5dbdf601..7d25cf91 100644
--- a/export_vars.sh.in
+++ b/export_vars.sh.in
@@ -8,4 +8,5 @@
 #   $ . path/to/apr-util/export_vars.sh
 #
 
+APRUTIL_EXPORT_INCLUDES="@APRUTIL_INCLUDES@"
 APRUTIL_EXPORT_LIBS="@APRUTIL_EXPORT_LIBS@"
diff --git a/hooks/Makefile.in b/hooks/Makefile.in
index 5eb933d6..a154a2d4 100644
--- a/hooks/Makefile.in
+++ b/hooks/Makefile.in
@@ -3,7 +3,7 @@ VPATH = @srcdir@
 
 top_builddir=@top_builddir@
 top_srcdir=@abs_srcdir@
-INCLUDES=-I$(top_builddir)/include -I$(top_srcdir)/include @APR_INCLUDES@
+INCLUDES=-I$(top_builddir)/include -I$(top_srcdir)/include @APR_INCLUDES@ @APRUTIL_INCLUDES@
 
 TARGETS = apr_hooks.lo
 
diff --git a/ldap/Makefile.in b/ldap/Makefile.in
index 72049547..771b0734 100644
--- a/ldap/Makefile.in
+++ b/ldap/Makefile.in
@@ -3,7 +3,7 @@ VPATH = @srcdir@
 
 top_builddir=@top_builddir@
 top_srcdir=@abs_srcdir@
-INCLUDES=-I$(top_builddir)/include -I$(top_srcdir)/include @APR_INCLUDES@
+INCLUDES=-I$(top_builddir)/include -I$(top_srcdir)/include @APR_INCLUDES@ @APRUTIL_INCLUDES@
 
 TARGETS = apr_ldap_compat.lo
 
diff --git a/test/Makefile.in b/test/Makefile.in
index f370b2ec..e7d39af5 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -3,7 +3,7 @@ VPATH = @srcdir@
 
 top_builddir=@top_builddir@
 top_srcdir=@abs_srcdir@
-INCLUDES=-I$(top_builddir)/include -I$(top_builddir)/include/private -I$(top_srcdir)/include -I$(top_srcdir)/include @APR_INCLUDES@
+INCLUDES=-I$(top_builddir)/include -I$(top_builddir)/include/private -I$(top_srcdir)/include -I$(top_srcdir)/include @APR_INCLUDES@ @APRUTIL_INCLUDES@
 TARGETS =
 PROGRAMS = testdbm testdate testmd4 testxml
 
diff --git a/uri/Makefile.in b/uri/Makefile.in
index c5f760a1..b69401ad 100644
--- a/uri/Makefile.in
+++ b/uri/Makefile.in
@@ -3,7 +3,7 @@ VPATH = @srcdir@
 
 top_builddir=@top_builddir@
 top_srcdir=@abs_srcdir@
-INCLUDES=-I$(top_builddir)/include -I$(top_builddir)/include/private -I$(top_srcdir)/include -I$(top_srcdir)/include/private @APR_INCLUDES@
+INCLUDES=-I$(top_builddir)/include -I$(top_builddir)/include/private -I$(top_srcdir)/include -I$(top_srcdir)/include/private @APR_INCLUDES@ @APRUTIL_INCLUDES@
 
 TARGETS = $(top_builddir)/include/private/uri_delims.h apr_uri.lo
 CLEAN_TARGETS = gen_uri_delims $(top_builddir)/include/private/uri_delims.h
diff --git a/xml/Makefile.in b/xml/Makefile.in
index d9f50d72..1aebc240 100644
--- a/xml/Makefile.in
+++ b/xml/Makefile.in
@@ -3,7 +3,7 @@ VPATH = @srcdir@
 
 top_builddir=@top_builddir@
 top_srcdir=@abs_srcdir@
-INCLUDES=-I$(top_builddir)/include -I$(top_builddir)/include/private -I$(top_builddir)/xml/expat/lib -I$(top_srcdir)/include -I$(top_srcdir)/include/private -I$(srcdir)/lib @APR_INCLUDES@
+INCLUDES=-I$(top_builddir)/include -I$(top_builddir)/include/private -I$(top_builddir)/xml/expat/lib -I$(top_srcdir)/include -I$(top_srcdir)/include/private -I$(srcdir)/lib @APR_INCLUDES@ @APRUTIL_INCLUDES@
 
 TARGETS = apr_xml.lo