thommay 2003/07/08 10:54:33
Modified: . CHANGES apu-config.in
include apu.h.in
Log:
Allow querying of the version of the DB libraries APU linked against.
* apu-config.in:
- new option --db-version.
* includes/apu.h.in:
- new #define APU_HAVE_DB_VERSION
Revision Changes Path
1.115 +3 -0 apr-util/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr-util/CHANGES,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- CHANGES 12 Jun 2003 07:27:10 -0000 1.114
+++ CHANGES 8 Jul 2003 17:54:32 -0000 1.115
@@ -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]
1.34 +6 -0 apr-util/apu-config.in
Index: apu-config.in
===================================================================
RCS file: /home/cvs/apr-util/apu-config.in,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- apu-config.in 20 Jun 2003 16:39:40 -0000 1.33
+++ apu-config.in 8 Jul 2003 17:54:32 -0000 1.34
@@ -73,6 +73,7 @@
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 @@
--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
@@ -236,6 +238,10 @@
else
echo "$APR_XML_EXPAT_OLD"
fi
+ exit 0
+ ;;
+ --db-version)
+ echo $APU_DB_VERSION
exit 0
;;
--help)
1.17 +3 -2 apr-util/include/apu.h.in
Index: apu.h.in
===================================================================
RCS file: /home/cvs/apr-util/include/apu.h.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- apu.h.in 1 Jan 2003 00:02:20 -0000 1.16
+++ apu.h.in 8 Jul 2003 17:54:32 -0000 1.17
@@ -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@
