summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES3
-rw-r--r--apu-config.in6
-rw-r--r--include/apu.h.in5
3 files changed, 12 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index 77b29256..31f370b1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
Changes with APR-util 0.9.4
+ *) Make the version of the db library APU built against visible.
+ [Thom May]
+
*) Fix a problem with VPATH builds copying the APR rules.mk into the
source directory rather than the build directory. [Justin Erenkrantz]
diff --git a/apu-config.in b/apu-config.in
index 3c508dd6..6ac75b4b 100644
--- a/apu-config.in
+++ b/apu-config.in
@@ -73,6 +73,7 @@ APRUTIL_LIBNAME="@APRUTIL_LIBNAME@"
APU_SOURCE_DIR="@abs_srcdir@"
APU_BUILD_DIR="@abs_builddir@"
APR_XML_EXPAT_OLD="@APR_XML_EXPAT_OLD@"
+APU_DB_VERSION="@apu_db_version@"
show_usage()
{
@@ -91,6 +92,7 @@ Known values for OPTION are:
--link-libtool print the libtool inputs for linking to APR-util
--apu-la-file print the path to the .la file, if available
--old-expat indicate if APR-util was built against an old expat
+ --db-version print the DB version
--version print APR-util's version as a dotted triple
--help print this help
@@ -238,6 +240,10 @@ while test $# -gt 0; do
fi
exit 0
;;
+ --db-version)
+ echo $APU_DB_VERSION
+ exit 0
+ ;;
--help)
show_usage
exit 0
diff --git a/include/apu.h.in b/include/apu.h.in
index 27abecb3..5422aa1f 100644
--- a/include/apu.h.in
+++ b/include/apu.h.in
@@ -117,8 +117,9 @@
/* found version @apu_db_version@ */
/* this is only required for compiling dbm/apr_dbm_berkeleydb */
#include <@apu_db_header@>
-#endif
-#endif
+#endif /* APU_DBM_BERKELEYDB_PRIVATE */
+#define APU_HAVE_DB_VERSION @apu_db_version@
+#endif /* APU_HAVE_DB */
#define APU_HAVE_APR_ICONV 0
#define APU_HAVE_ICONV @have_iconv@