Fix:core:Added preper check for QtXml availability

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@3345 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/configure.in b/navit/configure.in
index 01d5cd2..ae54358 100644 (file)
--- a/navit/configure.in
+++ b/navit/configure.in
@@ -888,10 +888,13 @@ AM_CONDITIONAL(GUI_WIN32, test "x${gui_win32}" = "xyes")
 AM_CONDITIONAL(QT_DECLARATIVE_NEWAPI,test "x${gui_qml}" = "xoldapi")
 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 QtXml], ,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 are missing")
+fi
+if test "x${gui_qml}" = "xyes" -a "x${QT_XML_CFLAGS}" = "x" -a "x${QT_XML_LIBS}" = "x"; then
+       PKG_CHECK_MODULES(QT_XML, [QtXml], ,gui_qml=no;gui_qml_reason="Package QtXml is 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 >= 4.6.0 ], ,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 is missing")
 fi
 if test "x${gui_qml}" = "xyes" ; then
        AC_DEFINE(USE_GUI_QML, 1, [Build with gui qml])
@@ -905,6 +908,8 @@ AC_SUBST(QT_GUI_CFLAGS)
 AC_SUBST(QT_GUI_LIBS)
 AC_SUBST(QT_DECLARATIVE_CFLAGS)
 AC_SUBST(QT_DECLARATIVE_LIBS)
+AC_SUBST(QT_XML_CFLAGS)
+AC_SUBST(QT_XML_LIBS)
 AM_CONDITIONAL(GUI_QML, test "x${gui_qml}" = "xyes")
 
 ## plugins