Cleanup ./configure Qt4/5 bat

diff --git a/bacula/autoconf/config.h.in b/bacula/autoconf/config.h.in
index 60cbb30e4560112fe5d05d844cea5c40e337d67c..d8f1e03fd39c22a7fc7ae008b1d6a59ed4b3399d 100644 (file)
--- a/bacula/autoconf/config.h.in
+++ b/bacula/autoconf/config.h.in
@@ -281,7 +281,7 @@
 /* Define to 1 if you have the `backtrace' function. */
 #undef HAVE_BACKTRACE
 
-/* Set if Bacula bat Qt4 GUI support enabled */
+/* Set if Bacula bat Qt GUI support enabled */
 #undef HAVE_BAT
 
 /* Define to 1 if you have the `be64toh' function. */

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index 8878b743b938e08b1e4bf5eb786f65ff5f34a0c1..1fc75a8e73adb7765e9ccc495314b146d56a04b8 100644 (file)
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -392,10 +392,10 @@ dnl -------------------------------------------
 dnl bat (default off)
 dnl -------------------------------------------
 AC_ARG_ENABLE(bat,
-   AC_HELP_STRING([--enable-bat], [enable build of bat Qt4 GUI @<:@default=no@:>@]),
+   AC_HELP_STRING([--enable-bat], [enable build of bat Qt GUI @<:@default=no@:>@]),
    [
        if test x$enableval = xyes; then
-         AC_DEFINE(HAVE_BAT, 1, [Set if Bacula bat Qt4 GUI support enabled])
+         AC_DEFINE(HAVE_BAT, 1, [Set if Bacula bat Qt GUI support enabled])
          support_bat=yes
        fi
    ]
@@ -403,78 +403,15 @@ AC_ARG_ENABLE(bat,
 
 BAT_DIR=
 if test x$support_bat = xyes; then
-   abc=`$PKGCONFIG --atleast-version=4.2 QtGui`
+   abc=`$PKGCONFIG QtGui`
    pkg=$?
    if test $pkg = 0; then
       BAT_DIR=src/qt-console
    else
-      AC_MSG_ERROR(Unable to find Qt4 installation needed by bat)
+      AC_MSG_ERROR(Unable to find Qt installation needed by bat)
    fi
 fi
 
-dnl
-dnl  The qwt library was used with bat, but that is no longer the case
-dnl
-got_qwt=no
-QWT_INC=
-QWT_LDFLAGS=
-QWT_LIB=
-QWT=
-no_qwt=no
-dnl if test x$support_bat = xyes; then
-dnl    AC_MSG_CHECKING(for qwt support)
-dnl    AC_ARG_WITH(qwt,
-dnl      AC_HELP_STRING([--with-qwt@<:@=DIR@:>@], [specify qwt library directory]),
-dnl      [
-dnl          case "$with_qwt" in
-dnl          no)
-dnl             no_qwt=yes
-dnl             ;;
-dnl          yes|*)
-dnl             if test -f ${with_qwt}/include/qwt.h; then
-dnl                QWT_INC="${with_qwt}/include"
-dnl                QWT_LDFLAGS="-L${with_qwt}/lib"
-dnl                QWT_LIB="-lqwt"
-dnl                QWT="qwt"
-dnl             fi
-dnl             ;;
-dnl          esac
-dnl      ]
-dnl    )
-
-dnl    dnl
-dnl    dnl Search in standard places, or --with-qwt not specified
-dnl    dnl
-dnl    if test $no_qwt = no; then
-dnl      if test x$QWT_INC = x; then
-dnl         for root in /usr /usr/local; do
-dnl            for ver in qwt qwt5 qwt-qt4; do
-dnl               if test -f ${root}/include/${ver}/qwt.h; then
-dnl                  QWT_INC="${root}/include/${ver}"
-dnl                  if test -d ${root}/lib64/; then
-dnl                     QWT_LDFLAGS="-L${root}/lib64"
-dnl                  elif test -d ${root}/lib/64/; then
-dnl                     QWT_LDFLAGS="-L${root}/64"
-dnl                  else
-dnl                     QWT_LDFLAGS="-L${root}/lib"
-dnl                  fi
-dnl                  QWT_LIB="-lqwt"
-dnl                  QWT="qwt"
-dnl                  got_qwt=yes
-dnl                  break;
-dnl               fi
-dnl            done
-dnl         done
-dnl      fi
-dnl    fi
-dnl    if test x$QWT_INC = x; then
-dnl      AC_MSG_RESULT(no)
-dnl    else
-dnl      AC_DEFINE(HAVE_QWT, 1, [Set if bat QWT library found])
-dnl      AC_MSG_RESULT(yes)
-dnl    fi
-dnl fi
-
 AC_SUBST(BAT_DIR)
 AC_SUBST(QWT_INC)
 AC_SUBST(QWT_LDFLAGS)

diff --git a/bacula/configure b/bacula/configure
index 8c65d4f5426612a41f86d9068b612d8b36b6439e..ee9ef981402cc507655a215e907b4cab809ce2a3 100755 (executable)
--- a/bacula/configure
+++ b/bacula/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for bacula 9.0.3.
+# Generated by GNU Autoconf 2.69 for bacula 9.0.6.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='bacula'
 PACKAGE_TARNAME='bacula'
-PACKAGE_VERSION='9.0.3'
-PACKAGE_STRING='bacula 9.0.3'
+PACKAGE_VERSION='9.0.6'
+PACKAGE_STRING='bacula 9.0.6'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1584,7 +1584,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures bacula 9.0.3 to adapt to many kinds of systems.
+\`configure' configures bacula 9.0.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1654,7 +1654,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of bacula 9.0.3:";;
+     short | recursive ) echo "Configuration of bacula 9.0.6:";;
    esac
   cat <<\_ACEOF
 
@@ -1671,7 +1671,7 @@ Optional Features:
   --enable-includes       enable installing of include files [default=no]
   --disable-nls           do not use Native Language Support
   --disable-rpath         do not hardcode runtime library paths
-  --enable-bat            enable build of bat Qt4 GUI [default=no]
+  --enable-bat            enable build of bat Qt GUI [default=no]
   --enable-smartalloc     enable smartalloc debugging support [default=no]
   --enable-lockmgr        enable lock manager support [default=no]
   --enable-static-tools   enable static tape tools [default=no]
@@ -1853,7 +1853,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-bacula configure 9.0.3
+bacula configure 9.0.6
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2788,7 +2788,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by bacula $as_me 9.0.3, which was
+It was created by bacula $as_me 9.0.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -21830,23 +21830,15 @@ fi
 
 BAT_DIR=
 if test x$support_bat = xyes; then
-   abc=`$PKGCONFIG --atleast-version=4.2 QtGui`
+   abc=`$PKGCONFIG QtGui`
    pkg=$?
    if test $pkg = 0; then
       BAT_DIR=src/qt-console
    else
-      as_fn_error $? "Unable to find Qt4 installation needed by bat" "$LINENO" 5
+      as_fn_error $? "Unable to find Qt installation needed by bat" "$LINENO" 5
    fi
 fi
 
-got_qwt=no
-QWT_INC=
-QWT_LDFLAGS=
-QWT_LIB=
-QWT=
-no_qwt=no
-
-
 
 
 
@@ -31704,7 +31696,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by bacula $as_me 9.0.3, which was
+This file was extended by bacula $as_me 9.0.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -31770,7 +31762,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-bacula config.status 9.0.3
+bacula config.status 9.0.6
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

diff --git a/bacula/src/qt-console/bat.pro.in b/bacula/src/qt-console/bat.pro.in
index 9728ecc78aedb6f40eb6d291f1e0c5d010425691..67ca841fe41aa48e2962f1414505c4ee6347f0d1 100644 (file)
--- a/bacula/src/qt-console/bat.pro.in
+++ b/bacula/src/qt-console/bat.pro.in
@@ -8,6 +8,7 @@
 #
 CONFIG += qt debug @QWT@
 
+
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
 bins.path = /$(DESTDIR)@sbindir@
@@ -17,6 +18,7 @@ confs.commands = ./install_conf_file
 help.path = /$(DESTDIR)@docdir@
 help.files = help/*.html images/status.png images/mail-message-new.png
 
+datarootdir  = @datarootdir@
 TEMPLATE     = app
 TARGET       = bat
 DEPENDPATH  += .