kes Add make clean of qt-source directory during ./configure

[bacula/bacula] / bacula / configure

diff --git a/bacula/configure b/bacula/configure
index 8be86793c6d264d63cabf78daaa30f8d3924519c..55745e5e8140da8be2e91c829148aa69cf1c4f20 100755 (executable)
--- a/bacula/configure
+++ b/bacula/configure
@@ -32117,15 +32117,25 @@ if test "${support_bat}" = "yes" ; then
     QMAKEBIN=qmake-qt4
   fi
 
-
-
   cd src/qt-console
   chmod 755 install_conf_file build-depkgs-qt-console
   echo "Creating bat Makefile"
   $QMAKEBIN
+  make clean
   cd ${BUILD_DIR}
 fi
 
+# 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