ebl update tokyo integration

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@6987 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index cb24ca40c76d548bdc08b42fc8649378baca479f..5cc212f30f1446199ff40177a884098367f486d4 100644 (file)
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -2345,9 +2345,7 @@ if test "${support_bat}" = "yes" ; then
   cd ${BUILD_DIR}
 fi
 
-echo "Doing make of dependencies"
-${MAKE:-make} depend
-
+# configure and prepare libtokyodbm for bacula
 pushd src/lib/tokyocabinet > /dev/null
 tcdbm_opt=
 if test x$largefile_support = xyes; then
@@ -2355,6 +2353,11 @@ if test x$largefile_support = xyes; then
 fi
 ./configure $tcdbm_opt
 popd > /dev/null
+# need tokyo header files for "make depend"
+cp src/lib/tokyocabinet/t*.h src/lib
+
+echo "Doing make of dependencies"
+${MAKE:-make} depend
 
 cd scripts
 chmod 755 startmysql stopmysql bacula startit stopit btraceback mtx-changer

diff --git a/bacula/configure b/bacula/configure
index 9dd2d7dab683f4c3ed05be3846fc5cef6f87d1b2..42440e2bfb6ecefb452aeebac756d74060ae7db6 100755 (executable)
--- a/bacula/configure
+++ b/bacula/configure
@@ -32124,16 +32124,19 @@ if test "${support_bat}" = "yes" ; then
   cd ${BUILD_DIR}
 fi
 
-echo "Doing make of dependencies"
-${MAKE:-make} depend
-
-pushd src/lib/tokyocabinet
+# configure and prepare libtokyodbm for bacula
+pushd src/lib/tokyocabinet > /dev/null
 tcdbm_opt=
 if test x$largefile_support = xyes; then
    tcdbm_opt=--enable-off64
 fi
 ./configure $tcdbm_opt
 popd > /dev/null
+# need tokyo header files for "make depend"
+cp src/lib/tokyocabinet/t*.h src/lib
+
+echo "Doing make of dependencies"
+${MAKE:-make} depend
 
 cd scripts
 chmod 755 startmysql stopmysql bacula startit stopit btraceback mtx-changer