From: <aka...@us...> - 2010-03-16 08:21:18
|
Revision: 3018 http://navit.svn.sourceforge.net/navit/?rev=3018&view=rev Author: akashihi Date: 2010-03-16 08:21:11 +0000 (Tue, 16 Mar 2010) Log Message: ----------- Fix:core:Added Qt version check into gui_qml requirements checking Modified Paths: -------------- trunk/navit/configure.in Modified: trunk/navit/configure.in =================================================================== --- trunk/navit/configure.in 2010-03-15 21:35:57 UTC (rev 3017) +++ trunk/navit/configure.in 2010-03-16 08:21:11 UTC (rev 3018) @@ -783,12 +783,12 @@ # qml AC_ARG_ENABLE(gui-qml, [ --disable-gui-qml disable gui type QML], gui_qml=$enableval;gui_qml_reason="configure parameter") if test "x${gui_qml}" = "xyes" -a "x${QT_GUI_CFLAGS}" = "x" -a "x${QT_GUI_LIBS}" = "x"; then - PKG_CHECK_MODULES(QT_GUI, [QtGui QtCore], ,gui_qml=no,gui_qml_reason="Packages QtGui and/or QtCore missing") + PKG_CHECK_MODULES(QT_GUI, [QtGui QtCore], ,gui_qml=no;gui_qml_reason="Packages QtGui and/or QtCore missing") fi if test "x${gui_qml}" = "xyes" -a "x${QT_DECLARATIVE_CFLAGS}" = "x" -a "x${QT_DECLARATIVE_LIBS}" = "x"; then - PKG_CHECK_MODULES(QT_DECLARATIVE, [QtDeclarative], ,gui_qml=no,gui_qml_reason="Packages QtDeclarative missing") + PKG_CHECK_MODULES(QT_DECLARATIVE, [QtDeclarative >= 4.6.0 ], ,gui_qml=no;gui_qml_reason="Packages QtDeclarative missing") fi -if test "x${graphics_qt_qpainter}" = "xyes" ; then +if test "x${gui_qml}" = "xyes" ; then AC_DEFINE(USE_GUI_QML, 1, [Build with gui qml]) MOC=`$PKG_CONFIG QtGui --variable=moc_location` if test "x${MOC}" = "x"; then @@ -802,8 +802,6 @@ AC_SUBST(QT_DECLARATIVE_LIBS) AM_CONDITIONAL(GUI_QML, test "x${gui_qml}" = "xyes") -AM_CONDITIONAL(GUI_QML, test "x${gui_qml}" = "xyes") - ## plugins # pedestrian AC_ARG_ENABLE(plugin-pedestrian, [ --enable-plugin-pedestrian enable pedestrian plugin], plugin_pedestrian=$enableval;plugin_pedestrian_reason="configure parameter") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |