X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fconfigure;h=42440e2bfb6ecefb452aeebac756d74060ae7db6;hb=a698b6e3cd8527d96541276cd912496b5ca0e175;hp=b7817aac830adc3e53145e1a473313dddf5090b9;hpb=39196adf310dbd385c931242bcbd1f6302a3aeee;p=bacula%2Fbacula

diff --git a/bacula/configure b/bacula/configure
index b7817aac83..42440e2bfb 100755
--- a/bacula/configure
+++ b/bacula/configure
@@ -13530,6 +13530,7 @@ QWT_INC=
 QWT_LDFLAGS=
 QWT_LIB=
 QWT=
+no_qwt=no
 if test x$support_bat = xyes; then
    { echo "$as_me:$LINENO: checking for qwt support" >&5
 echo $ECHO_N "checking for qwt support... $ECHO_C" >&6; }
@@ -13539,6 +13540,7 @@ if test "${with_qwt+set}" = set; then
   withval=$with_qwt;
 	case "$with_qwt" in
 	no)
+	   no_qwt=yes
 	  ;;
 	yes|*)
 	  if test -f ${with_qwt}/include/qwt.h; then
@@ -13556,7 +13558,8 @@ fi
 #
 # Search in standard places, or --with-qwt not specified
 #
-   if test x$QWT_INC = x; then
+   if test $no_qwt = no; then
+    if test x$QWT_INC = x; then
       for root in /usr /usr/local; do
 	 for ver in qwt qwt5 qwt-qt4; do
 	    if test -f ${root}/include/${ver}/qwt.h; then
@@ -13573,6 +13576,7 @@ fi
 	    fi
 	 done
       done
+    fi
    fi
    if test x$QWT_INC = x; then
       { echo "$as_me:$LINENO: result: no" >&5
@@ -32113,8 +32117,6 @@ 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"
@@ -32122,6 +32124,17 @@ if test "${support_bat}" = "yes" ; then
   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