jerenkrantz 02/05/08 15:00:58
Modified: . CHANGES Makefile.in
buckets Makefile.in
crypto Makefile.in
dbm Makefile.in
dbm/sdbm Makefile.in
encoding Makefile.in
hooks Makefile.in
ldap Makefile.in
misc Makefile.in
test Makefile.in
uri Makefile.in
xml Makefile.in
Log:
Rearrange INCLUDES so that APRUTIL_PRIV_INCLUDES is first to prevent
installed copies specified by either APR_INCLUDES or APRUTIL_INCLUDES
directives from potentially overriding our source includes.
Submitted by: Garrett Rooney <[EMAIL PROTECTED]>
Reviewed by: Justin Erenkrantz
Revision Changes Path
1.63 +3 -0 apr-util/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr-util/CHANGES,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- CHANGES 16 Apr 2002 07:14:50 -0000 1.62
+++ CHANGES 8 May 2002 22:00:57 -0000 1.63
@@ -1,5 +1,8 @@
Changes with APR-util b1
+ *) Rearrange INCLUDES so that APRUTIL_PRIV_INCLUDES is always
+ first. [Garrett Rooney <[EMAIL PROTECTED]>]
+
*) Add --old-expat option to apu-config to allow users of apr-util to
determine what expat it should expect to be installed. If the
flag is set to yes, it should include xmlparse.h. If it is set to
1.61 +1 -1 apr-util/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr-util/Makefile.in,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- Makefile.in 8 May 2002 21:05:58 -0000 1.60
+++ Makefile.in 8 May 2002 22:00:57 -0000 1.61
@@ -6,7 +6,7 @@
srcdir = @srcdir@
VPATH = @srcdir@
-INCLUDES = @APR_INCLUDES@ @APRUTIL_INCLUDES@ @APRUTIL_PRIV_INCLUDES@
+INCLUDES = @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APRUTIL_INCLUDES@
TARGET_LIB = libaprutil.la
INSTALL_SUBDIRS = @APR_XML_DIR@
1.17 +1 -1 apr-util/buckets/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr-util/buckets/Makefile.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Makefile.in 29 Mar 2002 08:12:08 -0000 1.16
+++ Makefile.in 8 May 2002 22:00:57 -0000 1.17
@@ -1,6 +1,6 @@
VPATH = @srcdir@
-INCLUDES = @APR_INCLUDES@ @APRUTIL_INCLUDES@ @APRUTIL_PRIV_INCLUDES@
+INCLUDES = @APRUTIL_PRIV_INCLUDES@ @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 \
1.12 +1 -1 apr-util/crypto/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr-util/crypto/Makefile.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile.in 6 Feb 2002 12:42:50 -0000 1.11
+++ Makefile.in 8 May 2002 22:00:57 -0000 1.12
@@ -1,6 +1,6 @@
VPATH = @srcdir@
-INCLUDES = @APR_INCLUDES@ @APRUTIL_INCLUDES@ @APRUTIL_PRIV_INCLUDES@
+INCLUDES = @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APRUTIL_INCLUDES@
TARGETS = apr_sha1.lo apr_md4.lo
1.12 +1 -1 apr-util/dbm/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr-util/dbm/Makefile.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile.in 6 Feb 2002 12:42:50 -0000 1.11
+++ Makefile.in 8 May 2002 22:00:57 -0000 1.12
@@ -1,6 +1,6 @@
VPATH = @srcdir@
-INCLUDES = @APR_INCLUDES@ @APRUTIL_INCLUDES@ @APRUTIL_PRIV_INCLUDES@
+INCLUDES = @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APRUTIL_INCLUDES@
TARGETS = apr_dbm.lo apr_dbm_berkeleydb.lo apr_dbm_gdbm.lo apr_dbm_sdbm.lo
1.9 +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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.in 6 Feb 2002 12:42:50 -0000 1.8
+++ Makefile.in 8 May 2002 22:00:58 -0000 1.9
@@ -1,6 +1,6 @@
VPATH = @srcdir@
-INCLUDES = @APR_INCLUDES@ @APRUTIL_INCLUDES@ @APRUTIL_PRIV_INCLUDES@
+INCLUDES = @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APRUTIL_INCLUDES@
TARGETS = sdbm.lo sdbm_hash.lo sdbm_lock.lo sdbm_pair.lo
1.12 +1 -1 apr-util/encoding/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr-util/encoding/Makefile.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile.in 6 Feb 2002 12:42:50 -0000 1.11
+++ Makefile.in 8 May 2002 22:00:58 -0000 1.12
@@ -1,6 +1,6 @@
VPATH = @srcdir@
-INCLUDES = @APR_INCLUDES@ @APRUTIL_INCLUDES@ @APRUTIL_PRIV_INCLUDES@
+INCLUDES = @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APRUTIL_INCLUDES@
TARGETS = apr_base64.lo
1.11 +1 -1 apr-util/hooks/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr-util/hooks/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile.in 6 Feb 2002 12:42:50 -0000 1.10
+++ Makefile.in 8 May 2002 22:00:58 -0000 1.11
@@ -1,6 +1,6 @@
VPATH = @srcdir@
-INCLUDES = @APR_INCLUDES@ @APRUTIL_INCLUDES@ @APRUTIL_PRIV_INCLUDES@
+INCLUDES = @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APRUTIL_INCLUDES@
TARGETS = apr_hooks.lo
1.6 +1 -1 apr-util/ldap/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr-util/ldap/Makefile.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.in 6 Feb 2002 12:42:50 -0000 1.5
+++ Makefile.in 8 May 2002 22:00:58 -0000 1.6
@@ -1,6 +1,6 @@
VPATH = @srcdir@
-INCLUDES = @APR_INCLUDES@ @APRUTIL_INCLUDES@ @APRUTIL_PRIV_INCLUDES@
+INCLUDES = @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APRUTIL_INCLUDES@
TARGETS = apr_ldap_compat.lo
1.8 +1 -1 apr-util/misc/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr-util/misc/Makefile.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.in 6 Feb 2002 12:42:50 -0000 1.7
+++ Makefile.in 8 May 2002 22:00:58 -0000 1.8
@@ -1,6 +1,6 @@
VPATH = @srcdir@
-INCLUDES = @APR_INCLUDES@ @APRUTIL_INCLUDES@ @APRUTIL_PRIV_INCLUDES@
+INCLUDES = @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APRUTIL_INCLUDES@
TARGETS = apr_date.lo apr_rmm.lo
1.25 +1 -1 apr-util/test/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr-util/test/Makefile.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Makefile.in 30 Apr 2002 14:57:26 -0000 1.24
+++ Makefile.in 8 May 2002 22:00:58 -0000 1.25
@@ -1,6 +1,6 @@
VPATH = @srcdir@
-INCLUDES = @APR_INCLUDES@ @APRUTIL_INCLUDES@ @APRUTIL_PRIV_INCLUDES@
+INCLUDES = @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APRUTIL_INCLUDES@
PROGRAMS = testdbm testdate testmd4 testxml testrmm
TARGETS = $(PROGRAMS)
1.16 +1 -1 apr-util/uri/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr-util/uri/Makefile.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Makefile.in 6 Feb 2002 12:42:51 -0000 1.15
+++ Makefile.in 8 May 2002 22:00:58 -0000 1.16
@@ -1,6 +1,6 @@
VPATH = @srcdir@
-INCLUDES = @APR_INCLUDES@ @APRUTIL_INCLUDES@ @APRUTIL_PRIV_INCLUDES@ -I.
+INCLUDES = @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APRUTIL_INCLUDES@ -I.
TARGETS = uri_delims.h apr_uri.lo
CLEAN_TARGETS = gen_uri_delims uri_delims.h
1.12 +1 -1 apr-util/xml/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr-util/xml/Makefile.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile.in 6 Feb 2002 12:42:51 -0000 1.11
+++ Makefile.in 8 May 2002 22:00:58 -0000 1.12
@@ -1,6 +1,6 @@
VPATH = @srcdir@
-INCLUDES = @APR_INCLUDES@ @APRUTIL_INCLUDES@ @APRUTIL_PRIV_INCLUDES@
+INCLUDES = @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APRUTIL_INCLUDES@
TARGETS = apr_xml.lo
