DB3 patch check fix by Stefan Muenkner.

diff --git a/macros/config-checks.m4 b/macros/config-checks.m4
index 37bef9e8a614dcfcfd732fbb665db1b3a0137917..4e0c72eb0c40afbae83332b326565eeff1925275 100644 (file)
--- a/macros/config-checks.m4
+++ b/macros/config-checks.m4
@@ -1,4 +1,4 @@
-dnl $Id: config-checks.m4,v 1.4 2003-05-20 20:50:49 didg Exp $
+dnl $Id: config-checks.m4,v 1.5 2003-06-06 19:45:51 srittau Exp $
 dnl Autoconf macro to set the configuration directories.
 
 AC_DEFUN([NETATALK_CONFIG_DIRS], [
@@ -14,10 +14,10 @@ AC_DEFUN([NETATALK_CONFIG_DIRS], [
                ]
        )
 
-       NLSDIR="${PKGCONFDIR}/nls"
+       NLSDIR="${datadir}/netatalk/nls"
 
        AC_ARG_WITH(nls-dir,
-               [  --with-nls-dir=PATH     path to NLS files [PKGCONF/nls]],
+               [  --with-nls-dir=PATH     path to NLS files [DATA/netatalk/nls]],
                [
                        if test "x$withval" != "x"; then
                                NLSDIR="$withval"

diff --git a/macros/db3-check.m4 b/macros/db3-check.m4
index a92fbf9d17ecf2751757b8354446e4185a4df3cd..b036882bf2076e675f13f05c313dcee2c9fc5c87 100644 (file)
--- a/macros/db3-check.m4
+++ b/macros/db3-check.m4
@@ -1,4 +1,4 @@
-dnl $Id: db3-check.m4,v 1.11 2003-02-24 10:49:57 didg Exp $
+dnl $Id: db3-check.m4,v 1.12 2003-06-06 19:45:51 srittau Exp $
 dnl Autoconf macro to check for the Berkeley DB library
 
 AC_DEFUN([AC_PATH_BDB], [
@@ -33,6 +33,7 @@ AC_DEFUN([AC_PATH_BDB], [
                                BDB_LIBS="$BDB_LIBS -ldb"
                                BDB_BIN=$bdbbindir
                                BDB_PATH="`echo $bdbdir | sed 's,include/db3$,,'`"
+                               BDB_PATH="`echo $BDB_PATH | sed 's,include$,,'`"
                        ])
                        CFLAGS="$savedcflags"
                        LDFLAGS="$savedldflags"