From: Kern Sibbald <kern@sibbald.com>
Date: Tue, 21 Nov 2017 17:37:05 +0000 (+0100)
Subject: Tweak recompile configure.in
X-Git-Tag: Release-9.0.6
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=df77ca2a09c9d863eacad8710c337f9939ed7f46;p=bacula%2Fbacula

Tweak recompile configure.in
---

diff --git a/bacula/configure b/bacula/configure
index ee9ef98140..8ae8e33442 100755
--- a/bacula/configure
+++ b/bacula/configure
@@ -886,7 +886,6 @@ LIBRSYNC_VERSION
 NDMP_VERSION
 JAVA_VERSION
 VIX_VERSION
-BQT4_VERSION
 DEPKGS_VERSION
 DEPKGS_QT_VERSION
 BDB_VERSION
@@ -21835,7 +21834,13 @@ if test x$support_bat = xyes; then
    if test $pkg = 0; then
       BAT_DIR=src/qt-console
    else
-      as_fn_error $? "Unable to find Qt installation needed by bat" "$LINENO" 5
+     abc=`$PKGCONFIG Qt5Gui`
+     pkg=$?
+     if test $pkg = 0; then
+	BAT_DIR=src/qt-console
+     else
+	as_fn_error $? "Unable to find either Qt4 or Qt5 installation needed by bat" "$LINENO" 5
+     fi
    fi
 fi