From 9910b2f7aaa17e65ad2405bf223150f65c2763c2 Mon Sep 17 00:00:00 2001
From: srittau <srittau>
Date: Fri, 6 Jun 2003 19:45:51 +0000
Subject: [PATCH] DB3 patch check fix by Stefan Muenkner.

---
 macros/config-checks.m4 | 6 +++---
 macros/db3-check.m4     | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/macros/config-checks.m4 b/macros/config-checks.m4
index 37bef9e8..4e0c72eb 100644
--- 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 a92fbf9d..b036882b 100644
--- 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"
-- 
2.39.2