ianh 02/01/18 21:03:57
Modified: . CHANGES apu-config.in configure.in
export_vars.sh.in
build apu-conf.m4
test Makefile.in
Log:
add --with-berkeley-db=DIR option.
Revision Changes Path
1.52 +2 -0 apr-util/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr-util/CHANGES,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- CHANGES 18 Jan 2002 19:07:05 -0000 1.51
+++ CHANGES 19 Jan 2002 05:03:57 -0000 1.52
@@ -1,4 +1,6 @@
Changes with APR-util b1
+ *) add --with-berkeley-db=DIR & --with-gdbm configure flags
+ [Ian Holsman/Justin Erenkrantz]
*) Fix expat detection to recognize installed versions.
[Eric Gillespie, Jr. <epg@pretzelnet.org>]
1.3 +5 -0 apr-util/apu-config.in
Index: apu-config.in
===================================================================
RCS file: /home/cvs/apr-util/apu-config.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- apu-config.in 18 Jan 2002 17:57:40 -0000 1.2
+++ apu-config.in 19 Jan 2002 05:03:57 -0000 1.3
@@ -62,6 +62,7 @@
TOP_SRCDIR="@top_srcdir@"
LIBS="@APRUTIL_EXPORT_LIBS@"
INCLUDES="@APRUTIL_INCLUDES@"
+LDFLAGS="@APRUTIL_LDFLAGS@"
show_usage()
{
@@ -71,6 +72,7 @@
Known values for OPTION are:
--prefix[=DIR] change prefix to DIR
--includes print include information
+ --ldflags print linker flags
--libs print library information
--help print this help
EOF
@@ -106,6 +108,9 @@
;;
--includes)
echo $INCLUDES
+ ;;
+ --ldflags)
+ echo $LDFLAGS
;;
--help)
show_usage
1.44 +1 -0 apr-util/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr-util/configure.in,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- configure.in 18 Jan 2002 17:57:40 -0000 1.43
+++ configure.in 19 Jan 2002 05:03:57 -0000 1.44
@@ -86,6 +86,7 @@
AC_SUBST(APRUTIL_EXPORT_LIBS)
AC_SUBST(APRUTIL_INCLUDES)
+AC_SUBST(APRUTIL_LDFLAGS)
AC_SUBST(LDFLAGS)
APR_ADDTO(LIBS,[$APRUTIL_EXPORT_LIBS])
1.3 +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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- export_vars.sh.in 18 Jan 2002 17:57:40 -0000 1.2
+++ export_vars.sh.in 19 Jan 2002 05:03:57 -0000 1.3
@@ -10,3 +10,4 @@
APRUTIL_EXPORT_INCLUDES="@APRUTIL_INCLUDES@"
APRUTIL_EXPORT_LIBS="@APRUTIL_EXPORT_LIBS@"
+APRUTIL_LDFLAGS="@APRUTIL_LDFLAGS@"
1.29 +74 -22 apr-util/build/apu-conf.m4
Index: apu-conf.m4
===================================================================
RCS file: /home/cvs/apr-util/build/apu-conf.m4,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- apu-conf.m4 18 Jan 2002 19:07:05 -0000 1.28
+++ apu-conf.m4 19 Jan 2002 05:03:57 -0000 1.29
@@ -158,6 +158,32 @@
fi
])
+AC_DEFUN(APU_CHECK_BERKELEY_DB,[
+if test "$apu_want_db" != "0"; then
+ APU_CHECK_DB4
+ if test "$apu_db_version" != "4"; then
+ APU_CHECK_DB3
+ if test "$apu_db_version" != "3"; then
+ APU_CHECK_DB2
+ if test "$apu_db_version" != "2"; then
+ APU_CHECK_DB1
+ if test "$apu_db_version" != "1"; then
+ APU_CHECK_DB185
+ fi
+ fi
+ fi
+ fi
+fi
+AC_MSG_CHECKING(for Berkeley DB)
+if test "$apu_db_version" != "0"; then
+ apu_have_db=1
+ AC_MSG_RESULT(found db$apu_db_version)
+else
+ AC_MSG_RESULT(not found)
+fi
+
+
+])
dnl
dnl APU_CHECK_DBM: see what kind of DBM backend to use for apr_dbm.
dnl
@@ -209,30 +235,56 @@
dnl We're going to try to find the highest version of Berkeley DB supported.
-APU_CHECK_DB4
-if test "$apu_db_version" != "4"; then
- APU_CHECK_DB3
- if test "$apu_db_version" != "3"; then
- APU_CHECK_DB2
- if test "$apu_db_version" != "2"; then
- APU_CHECK_DB1
- if test "$apu_db_version" != "1"; then
- APU_CHECK_DB185
- fi
+AC_ARG_WITH([berkeley-db],
+[--with-berkeley-db=PATH
+ Find the Berkeley DB header and library in \`PATH/include' and
+ \`PATH/lib'. If PATH is of the form \`HEADER:LIB', then search
+ for header files in HEADER, and the library in LIB. If you omit
+ the \`=PATH' part completely, the configure script will search
+ for Berkeley DB in a number of standard places.
+], [
+ if test "$withval" = "yes"; then
+ apu_want_db=1
+ BDB_INC=""
+ BDB_LDFLAGS=""
+ elif test "$withval" = "no"; then
+ apu_want_db=0
+ else
+ apu_want_db=1
+ case "$withval" in
+ *":"*)
+ BDB_INC="-I`echo $withval |sed -e 's/:.*$//'`"
+ BDB_LDFLAGS="-L`echo $withval |sed -e 's/^.*://'`"
+ ;;
+ *)
+ BDB_INC="-I$withval/include"
+ BDB_LDFLAGS="-L$withval/lib"
+ ;;
+ esac
+ AC_MSG_RESULT(looking for berkeley-db includes with $BDB_INC)
+ AC_MSG_RESULT(looking for berkeley-db libs with $BDB_LDFLAGS)
fi
- fi
-fi
+ SAVE_CPPFLAGS="$CPPFLAGS"
+ SAVE_LDFLAGS="$LDFLAGS"
+ CPPFLAGS="$CPPFLAGS $BDB_INC"
+ LDFLAGS="$LDFLAGS $BDB_LDFLAGS"
+ if test "$apu_want_db" != "0"; then
+ APU_CHECK_BERKELEY_DB
+ if test "$apu_db_version" != "0"; then
+ if test "$withval" != "yes"; then
+ APR_ADDTO( APRUTIL_INCLUDES, [$BDB_INC])
+ APR_ADDTO( APRUTIL_LDFLAGS, [$BDB_LDFLAGS])
+ fi
+ elif test "$withval" != "yes"; then
+ AC_ERROR( Berkeley DB not found in the specified directory)
+ fi
+ fi
+ CPPFLAGS="$SAVE_CPPFLAGS"
+ LDFLAGS="$SAVE_LDFLAGS"
+],[
+ APU_CHECK_BERKELEY_DB
+])
-dnl Yes, it'd be nice if we could collate the output in an order
-dnl so that the AC_MSG_CHECKING would be output before the actual
-dnl checks, but it isn't happening now.
-AC_MSG_CHECKING(for Berkeley DB)
-if test "$apu_db_version" != "0"; then
- apu_have_db=1
- AC_MSG_RESULT(found db$apu_db_version)
-else
- AC_MSG_RESULT(not found)
-fi
dnl Note that we may have found db3, but the user wants db1. So, check
dnl explicitly for db1 in this case. Unfortunately, this means
1.20 +1 -1 apr-util/test/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr-util/test/Makefile.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Makefile.in 18 Jan 2002 17:57:41 -0000 1.19
+++ Makefile.in 19 Jan 2002 05:03:57 -0000 1.20
@@ -9,7 +9,7 @@
# bring in rules.mk for standard functionality
@INCLUDE_RULES@
-LIBS = @LIBS@
+LIBS = @APRUTIL_LDFLAGS@ @LIBS@
test: $(PROGRAMS)
|