Make sure the BDB bin directory is properly set.

Submitted by:	Olaf Hering <olh@suse.de>

diff --git a/bin/cnid/cnid_maint.in b/bin/cnid/cnid_maint.in
index e77af917c0386de34b12e719d2e33577f096bfec..63161ac75d7496bb2189e309c4e13d2025d37f6f 100755 (executable)
--- a/bin/cnid/cnid_maint.in
+++ b/bin/cnid/cnid_maint.in
@@ -3,7 +3,7 @@
 #
 # cnid_maint: A script to maintain the consistency of CNID databases.
 #
-# $Id: cnid_maint.in,v 1.13 2003-01-04 21:41:48 jmarcus Exp $
+# $Id: cnid_maint.in,v 1.14 2003-02-16 02:13:05 jmarcus Exp $
 #
 
 use strict;
@@ -32,9 +32,9 @@ $START_CMD = '/usr/local/etc/rc.d/netatalk.sh start';
 # Below is the example of a BSD ps.  A SYSV example is:
 # /bin/ps -eflouid,pid,ppid,comm
 $PS_CMD             = '@PS@ -axouser,pid,ppid,command';
-$DB_STAT            = '@BDB_PATH@bin/db_stat';
-$DB_RECOVER         = '@BDB_PATH@bin/db_recover';
-$DB_VERIFY          = '@BDB_PATH@bin/db_verify';
+$DB_STAT            = '@BDB_BIN@bin/db_stat';
+$DB_RECOVER         = '@BDB_BIN@bin/db_recover';
+$DB_VERIFY          = '@BDB_BIN@bin/db_verify';
 $APPLE_VOLUMES_FILE = '@PKGCONFDIR@/AppleVolumes.default';
 ## End edit section
 

diff --git a/macros/db3-check.m4 b/macros/db3-check.m4
index fdab9360128681a5695fdc16e40a35ac44157e44..a85941ea81480edc9b106b729fecc88e79abe71c 100644 (file)
--- a/macros/db3-check.m4
+++ b/macros/db3-check.m4
@@ -1,4 +1,4 @@
-dnl $Id: db3-check.m4,v 1.8 2003-01-04 21:41:49 jmarcus Exp $
+dnl $Id: db3-check.m4,v 1.9 2003-02-16 02:13:05 jmarcus Exp $
 dnl Autoconf macro to check for the Berkeley DB library
 
 AC_DEFUN([AC_PATH_BDB], [
@@ -15,6 +15,8 @@ AC_DEFUN([AC_PATH_BDB], [
                if test -f "$bdbdir/db.h" ; then
                        bdblibdir="`echo $bdbdir | sed 's/include\/db3$/lib/'`"
                        bdblibdir="`echo $bdblibdir | sed 's/include$/lib/'`"
+                       bdbbindir="`echo $bdbdir | sed 's/include\/db3$/bin/'`"
+                       bdbbindir="`echo $bdbbindir | sed 's/include$/bin/'`"
 
                        savedcflags="$CFLAGS"
                        savedldflags="$LDFLAGS"
@@ -24,6 +26,7 @@ AC_DEFUN([AC_PATH_BDB], [
                                bdbfound=yes
                                BDB_CFLAGS="-I$bdbdir"
                                BDB_LIBS="-L$bdblibdir -ldb"
+                               BDB_BIN=$bdbbindir
                                BDB_PATH="`echo $bdbdir | sed 's,include/db3$,,'`"
                        ])
                        CFLAGS="$savedcflags"
@@ -40,5 +43,6 @@ AC_DEFUN([AC_PATH_BDB], [
 
        AC_SUBST(BDB_CFLAGS)
        AC_SUBST(BDB_LIBS)
+       AC_SUBST(BDB_BIN)
        AC_SUBST(BDB_PATH)
 ])