ianh 02/01/18 09:57:42
Modified: . Makefile.in apu-config.in configure.in
export_vars.sh.in
buckets Makefile.in
build apu-conf.m4
crypto Makefile.in
dbm Makefile.in
dbm/sdbm Makefile.in
encoding Makefile.in
hooks Makefile.in
ldap Makefile.in
test Makefile.in
uri Makefile.in
xml Makefile.in
Log:
APRUTIL_INCLUDES now available.
todo: get httpd to link to it.
Revision Changes Path
1.58 +1 -1 apr-util/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr-util/Makefile.in,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- Makefile.in 17 Jan 2002 00:50:12 -0000 1.57
+++ Makefile.in 18 Jan 2002 17:57:40 -0000 1.58
@@ -6,7 +6,7 @@
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@
1.2 +5 -0 apr-util/apu-config.in
Index: apu-config.in
===================================================================
RCS file: /home/cvs/apr-util/apu-config.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apu-config.in 17 Jan 2002 00:50:12 -0000 1.1
+++ apu-config.in 18 Jan 2002 17:57:40 -0000 1.2
@@ -61,6 +61,7 @@
LIBDIR="@libdir@"
TOP_SRCDIR="@top_srcdir@"
LIBS="@APRUTIL_EXPORT_LIBS@"
+INCLUDES="@APRUTIL_INCLUDES@"
show_usage()
{
@@ -69,6 +70,7 @@
Known values for OPTION are:
--prefix[=DIR] change prefix to DIR
+ --includes print include information
--libs print library information
--help print this help
EOF
@@ -101,6 +103,9 @@
LIBS=`echo "$LIBS" | sed "s/$TMP_SRCDIR/$TMP_PREFIX/g"`
fi
echo "$LIBS"
+ ;;
+ --includes)
+ echo $INCLUDES
;;
--help)
show_usage
1.43 +4 -0 apr-util/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr-util/configure.in,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- configure.in 17 Jan 2002 00:50:12 -0000 1.42
+++ configure.in 18 Jan 2002 17:57:40 -0000 1.43
@@ -55,6 +55,8 @@
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
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])
1.2 +1 -0 apr-util/export_vars.sh.in
Index: export_vars.sh.in
===================================================================
RCS file: /home/cvs/apr-util/export_vars.sh.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- export_vars.sh.in 12 Dec 2000 09:44:52 -0000 1.1
+++ export_vars.sh.in 18 Jan 2002 17:57:40 -0000 1.2
@@ -8,4 +8,5 @@
# $ . path/to/apr-util/export_vars.sh
#
+APRUTIL_EXPORT_INCLUDES="@APRUTIL_INCLUDES@"
APRUTIL_EXPORT_LIBS="@APRUTIL_EXPORT_LIBS@"
1.14 +1 -1 apr-util/buckets/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr-util/buckets/Makefile.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Makefile.in 4 Jan 2002 21:54:49 -0000 1.13
+++ Makefile.in 18 Jan 2002 17:57:41 -0000 1.14
@@ -3,7 +3,7 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-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 \
1.26 +4 -2 apr-util/build/apu-conf.m4
Index: apu-conf.m4
===================================================================
RCS file: /home/cvs/apr-util/build/apu-conf.m4,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- apu-conf.m4 17 Jan 2002 18:55:13 -0000 1.25
+++ apu-conf.m4 18 Jan 2002 17:57:41 -0000 1.26
@@ -57,6 +57,7 @@
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_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 @@
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?
1.10 +1 -1 apr-util/crypto/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr-util/crypto/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.in 4 Jan 2002 21:54:49 -0000 1.9
+++ Makefile.in 18 Jan 2002 17:57:41 -0000 1.10
@@ -3,7 +3,7 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-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
1.10 +1 -1 apr-util/dbm/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr-util/dbm/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.in 4 Jan 2002 21:54:49 -0000 1.9
+++ Makefile.in 18 Jan 2002 17:57:41 -0000 1.10
@@ -3,7 +3,7 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-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
1.7 +1 -1 apr-util/dbm/sdbm/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr-util/dbm/sdbm/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.in 4 Jan 2002 21:54:49 -0000 1.6
+++ Makefile.in 18 Jan 2002 17:57:41 -0000 1.7
@@ -3,7 +3,7 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-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
1.10 +1 -1 apr-util/encoding/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr-util/encoding/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.in 4 Jan 2002 21:54:49 -0000 1.9
+++ Makefile.in 18 Jan 2002 17:57:41 -0000 1.10
@@ -3,7 +3,7 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-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
1.9 +1 -1 apr-util/hooks/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr-util/hooks/Makefile.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.in 4 Jan 2002 21:54:50 -0000 1.8
+++ Makefile.in 18 Jan 2002 17:57:41 -0000 1.9
@@ -3,7 +3,7 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-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
1.4 +1 -1 apr-util/ldap/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr-util/ldap/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.in 4 Jan 2002 21:54:50 -0000 1.3
+++ Makefile.in 18 Jan 2002 17:57:41 -0000 1.4
@@ -3,7 +3,7 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-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
1.19 +1 -1 apr-util/test/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr-util/test/Makefile.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Makefile.in 11 Jan 2002 00:10:43 -0000 1.18
+++ Makefile.in 18 Jan 2002 17:57:41 -0000 1.19
@@ -3,7 +3,7 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-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
1.14 +1 -1 apr-util/uri/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr-util/uri/Makefile.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Makefile.in 4 Jan 2002 21:54:50 -0000 1.13
+++ Makefile.in 18 Jan 2002 17:57:41 -0000 1.14
@@ -3,7 +3,7 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-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
1.10 +1 -1 apr-util/xml/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr-util/xml/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.in 4 Jan 2002 21:54:50 -0000 1.9
+++ Makefile.in 18 Jan 2002 17:57:42 -0000 1.10
@@ -3,7 +3,7 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-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
