From: <ri...@us...> - 2007-10-24 18:38:52
|
Revision: 5799 http://bacula.svn.sourceforge.net/bacula/?rev=5799&view=rev Author: ricozz Date: 2007-10-24 11:38:54 -0700 (Wed, 24 Oct 2007) Log Message: ----------- ebl Use qmake-qt4 instead of qmake when available (debian system). Modified Paths: -------------- trunk/bacula/autoconf/configure.in trunk/bacula/technotes-2.3 Modified: trunk/bacula/autoconf/configure.in =================================================================== --- trunk/bacula/autoconf/configure.in 2007-10-24 18:37:02 UTC (rev 5798) +++ trunk/bacula/autoconf/configure.in 2007-10-24 18:38:54 UTC (rev 5799) @@ -74,6 +74,8 @@ 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 @@ ) 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 Modified: trunk/bacula/technotes-2.3 =================================================================== --- trunk/bacula/technotes-2.3 2007-10-24 18:37:02 UTC (rev 5798) +++ trunk/bacula/technotes-2.3 2007-10-24 18:38:54 UTC (rev 5799) @@ -1,6 +1,8 @@ Technical notes on version 2.3 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. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |