ebl Use qmake-qt4 instead of qmake when available (debian system)

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.2@5798 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index ccbb0dd41909a72cd2b1ad7e266c39bec013b2b1..cdfc17f97bfadb37fcab416a346f610f189109d2 100644 (file)
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -74,6 +74,8 @@ AC_PATH_PROG(GROWISOFS, growisofs, growisofs)
 AC_PATH_PROG(DVDRWMEDIAINFO, dvd+rw-mediainfo, dvd+rw-mediainfo)
 AC_PATH_PROG(DVDRWFORMAT, dvd+rw-format, dvd+rw-format)
 AC_PATH_PROG(PKGCONFIG, pkg-config, pkg-config)
+AC_PATH_PROG(QMAKE, qmake, none)
+AC_PATH_PROG(QMAKEQT4, qmake-qt4, none)
 AC_ARG_VAR(WXCONFIG, [wx-config command. On some systems, you must set it to wx-config-2.6 to use wxWidgets 2.6.])
 if test "x$WXCONFIG" = x; then
   WXCONFIG=wx-config
@@ -2230,10 +2232,23 @@ AC_OUTPUT([autoconf/Make.common \
 )
 
 if test "${support_bat}" = "yes" ; then
+  if test "x$QMAKE" = "xnone" && test "x$QMAKEQT4" = "xnone"; then
+  echo "Could not find qmake or qmake-qt4 in $PATH. Check your Qt installation"
+  exit 1
+  fi
+
+  QMAKEBIN="qmake"
+
+  if test "x$QMAKEQT4" != "xnone"; then
+    QMAKEBIN=qmake-qt4
+  fi
+
+
+  
   cd src/qt-console
   chmod 755 install_conf_file build-depkgs-qt-console
-  echo "Creating bat Makefile" 
-  qmake
+  echo "Creating bat Makefile"
+  $QMAKEBIN
   cd ${BUILD_DIR}
 fi
 

diff --git a/bacula/technotes-2.1 b/bacula/technotes-2.1
index 6f1ef247f5a161e4790d54b85f68867c81cafa6a..3708209945ef52e0d45a898be69daf020afb4e25 100644 (file)
--- a/bacula/technotes-2.1
+++ b/bacula/technotes-2.1
@@ -1,6 +1,8 @@
               Technical notes on version 2.2
 
 General:
+24Oct07
+ebl  Use qmake-qt4 instead of qmake when available (debian system). 
 22Oct07
 kes  Add a security warning to src/cats/make_catalog_backup.in indicating
      that passing the password via the command line (arg 3) is insecure.