This commit was manufactured by cvs2svn to create tag
'APACHE_2_0_43'.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr-util/tags/APACHE_2_0_43@58771 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/apu-config.in b/apu-config.in
index b688bf6..5a02305 100644
--- a/apu-config.in
+++ b/apu-config.in
@@ -68,7 +68,7 @@
INCLUDES="@APRUTIL_INCLUDES@"
LDFLAGS="@APRUTIL_LDFLAGS@"
-APRUTIL_LIBNAME="@APRUTIL_LIBNAME@"
+APRUTIL_LIBNAME="lib@APRUTIL_LIBNAME@.la"
APU_SOURCE_DIR="@top_srcdir@"
APU_BUILD_DIR="@top_builddir@"
@@ -81,7 +81,6 @@
Known values for OPTION are:
--prefix[=DIR] change prefix to DIR
- --bindir print location where binaries are installed
--includes print include information
--ldflags print linker flags
--libs print library information
@@ -110,26 +109,22 @@
thisdir="`dirname $0`"
thisdir="`cd $thisdir && pwd`"
if test -d $bindir; then
- tmpbindir="`cd $bindir && pwd`"
+ tmpbindir="`cd $bindir && pwd`"
else
- tmpbindir=""
+ tmpbindir=""
fi
if test "$tmpbindir" = "$thisdir"; then
- location=installed
+ location=installed
elif test "$APU_SOURCE_DIR" = "$thisdir"; then
- location=source
+ location=source
else
- location=build
+ location=build
fi
if test "$location" = "installed"; then
- LA_FILE="$libdir/lib${APRUTIL_LIBNAME}.la"
-
- LIBS=`echo "$LIBS" | sed -e "s $APU_BUILD_DIR/xml/expat $prefix g" -e "s $prefix/lib/libexpat.la -lexpat g"`
- LDFLAGS=`echo "$LDFLAGS" | sed -e "s $APU_BUILD_DIR/xml/expat $prefix g"`
- INCLUDES=`echo "$INCLUDES" | sed -e "s $APU_BUILD_DIR/xml/expat $prefix g" -e "s -I$prefix/lib g"`
+ LA_FILE="$libdir/$APRUTIL_LIBNAME"
else
- LA_FILE="$thisdir/lib${APRUTIL_LIBNAME}.la"
+ LA_FILE="$thisdir/$APRUTIL_LIBNAME"
fi
flags=""
@@ -150,11 +145,12 @@
echo $prefix
exit 0
;;
- --bindir)
- echo $bindir
- exit 0
- ;;
--libs)
+ if test "$location" = "installed" && test -f $PREFIX/lib/libexpat.la; then
+ TMP_BUILDDIR=`echo "$APU_BUILD_DIR/xml/expat" | sed 's/\\//\\\\\\//g'`
+ TMP_PREFIX=`echo $prefix | sed 's/\\//\\\\\\//g'`
+ LIBS=`echo "$LIBS" | sed "s/$TMP_BUILDDIR/$TMP_PREFIX/g"`
+ fi
flags="$flags $LIBS"
;;
--includes)
@@ -176,9 +172,9 @@
--link-ld)
if test "$location" = "installed"; then
### avoid using -L if libdir is a "standard" location like /usr/lib
- flags="$flags -L$libdir -l$APRUTIL_LIBNAME"
+ flags="$flags -L$libdir -laprutil"
else
- flags="$flags -L$thisdir -l$APRUTIL_LIBNAME"
+ flags="$flags -L$thisdir -l@APRUTIL_LIBNAME@"
fi
;;
--link-libtool)
@@ -190,7 +186,7 @@
flags="$flags $LA_FILE"
elif test "$location" = "installed"; then
### avoid using -L if libdir is a "standard" location like /usr/lib
- flags="$flags -L$libdir -l$APRUTIL_LIBNAME"
+ flags="$flags -L$libdir -l@APRUTIL_LIBNAME@"
else
flags="$flags $LA_FILE"
fi
diff --git a/dbm/apr_dbm_berkeleydb.c b/dbm/apr_dbm_berkeleydb.c
index 1840aa4..4268c21 100644
--- a/dbm/apr_dbm_berkeleydb.c
+++ b/dbm/apr_dbm_berkeleydb.c
@@ -73,11 +73,8 @@
*/
#if defined(DB_VERSION_MAJOR) && (DB_VERSION_MAJOR == 4)
-/* DB 4.1 has an altered open() argument list. */
-#if defined(DB_VERSION_MINOR) && (DB_VERSION_MINOR >= 1)
-#define DB_NEED_OPEN_TXN_ARG
-#endif
-/* Otherwise, DB4 can be treated as DB3. */
+/* At this time, there are no differences from our perspective between
+ * DB3 and DB4. */
#define DB_VER 3
#elif defined(DB_VERSION_MAJOR) && (DB_VERSION_MAJOR == 3)
#define DB_VER 3
@@ -198,11 +195,7 @@
#if DB_VER == 3
if ((dberr = db_create(&file.bdb, NULL, 0)) == 0) {
- if ((dberr = (*file.bdb->open)(file.bdb,
-#ifdef DB_NEED_OPEN_TXN_ARG
- NULL,
-#endif
- pathname, NULL,
+ if ((dberr = (*file.bdb->open)(file.bdb, pathname, NULL,
DB_HASH, dbmode,
apr_posix_perms2mode(perm))) != 0) {
/* close the DB handler */
diff --git a/include/apu.hw b/include/apu.hw
index c8f5584..feeee63 100644
--- a/include/apu.hw
+++ b/include/apu.hw
@@ -154,7 +154,7 @@
#endif
#endif
-#define APU_HAVE_APR_ICONV 1
+#define APU_HAVE_APR_ICONV 0
#define APU_HAVE_ICONV 0
#define APR_HAS_XLATE (APU_HAVE_APR_ICONV || APU_HAVE_ICONV)
