]> git.sur5r.net Git - bacula/bacula/commitdiff
Tweak recompile configure.in Release-9.0.6
authorKern Sibbald <kern@sibbald.com>
Tue, 21 Nov 2017 17:37:05 +0000 (18:37 +0100)
committerKern Sibbald <kern@sibbald.com>
Tue, 21 Nov 2017 17:37:16 +0000 (18:37 +0100)
bacula/configure

index ee9ef981402cc507655a215e907b4cab809ce2a3..8ae8e33442e3b99343834095f28ae049e67ad2bf 100755 (executable)
@@ -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