diff options
| author | gstein <gstein@13f79535-47bb-0310-9956-ffa450edef68> | 2002-02-06 12:42:51 +0000 |
|---|---|---|
| committer | gstein <gstein@13f79535-47bb-0310-9956-ffa450edef68> | 2002-02-06 12:42:51 +0000 |
| commit | 380ae7b1e8c4bd299a2e8f039bf981bbde3a15ae (patch) | |
| tree | 22b1107bd3d1050562712a729a5213228294add3 /dbm | |
| parent | 61858e6860365c96ab488882bff68b05f4a47b12 (diff) | |
| download | libapr-util-380ae7b1e8c4bd299a2e8f039bf981bbde3a15ae.tar.gz | |
Switch APRUTIL over to use the APR_FIND_APR macro provided by APR.
Also cleaned up the configuration (ues apr-config, avoid APRVARS,
handle includes better, etc). Revamp all the Makefiles to simplify
their INCLUDES handling and to toss the unused srcdir variable.
* configure.in: use ../apr/build/find_apr.m4; this will eventually
need to change to a copied find_apr, but there is more work for
that to happen (we also have to get rules.mk from an installed
APR, for instance). revamp all the includes stuff: the INCLUDES
symbol was unused. define APRUTIL_INCLUDES for the public includes
(will go into apu-config) and APRUTIL_PRIV_INCLUDES for our
private stuff (only used in our build). don't worry about setting
CFLAGS either. LIBS now uses APR_LIBS, but we probably don't want
to set LIBS.
* apu-conf.m4: remove custom --with-apr processing and use
APR_FIND_APR (from find_apr.m4). tweak some of the
fetching-of-flags from APR to use apr-config.
* test/Makefile.in: don't refer to libapr.la explicitly. use APR_LIBS.
* uri/Makefile.in: create uri_delims.h in BUILD/uri/ rather than our
private include area. add the .c file as a dep of apr_uri.lo.
ensure that the INCLUDES has an "-I." to pick up the delims.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@58551 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'dbm')
| -rw-r--r-- | dbm/Makefile.in | 5 | ||||
| -rw-r--r-- | dbm/sdbm/Makefile.in | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/dbm/Makefile.in b/dbm/Makefile.in index e4277e27..6b12994c 100644 --- a/dbm/Makefile.in +++ b/dbm/Makefile.in @@ -1,9 +1,6 @@ -srcdir = @srcdir@ 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@ @APRUTIL_INCLUDES@ +INCLUDES = @APR_INCLUDES@ @APRUTIL_INCLUDES@ @APRUTIL_PRIV_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 17d1c5e6..b1751b12 100644 --- a/dbm/sdbm/Makefile.in +++ b/dbm/sdbm/Makefile.in @@ -1,9 +1,6 @@ -srcdir = @srcdir@ VPATH = @srcdir@ -top_builddir=@top_builddir@ -top_srcdir=@abs_srcdir@ -INCLUDES=-I$(top_builddir)/include -I$(top_srcdir)/include @APR_INCLUDES@ @APRUTIL_INCLUDES@ +INCLUDES = @APR_INCLUDES@ @APRUTIL_INCLUDES@ @APRUTIL_PRIV_INCLUDES@ TARGETS = sdbm.lo sdbm_hash.lo sdbm_lock.lo sdbm_pair.lo |