diff options
| author | akashihi <akashihi@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2010-03-30 11:04:03 +0000 |
|---|---|---|
| committer | akashihi <akashihi@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2010-03-30 11:04:03 +0000 |
| commit | a617640fa63ce94c3334d79028918198c4c00595 (patch) | |
| tree | 448f5501c2dbe9390099c7062ff8eadf36716c22 /configure.in | |
| parent | 3e47066188ac949ef1cbdc0c5b4693128155f56b (diff) | |
| download | navit-a617640fa63ce94c3334d79028918198c4c00595.tar.gz | |
Add:gui/qml:Added Qt 4.7 support
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@3101 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/configure.in b/configure.in index 86867bb90..7c7a5cbb8 100644 --- a/configure.in +++ b/configure.in @@ -784,12 +784,14 @@ AM_CONDITIONAL(GUI_INTERNAL, test "x${gui_internal}" = "xyes") AC_ARG_ENABLE(gui-win32, [ --disable-gui-win32 disable gui type win32], gui_win32=$enableval;gui_win32_reason="configure parameter") AM_CONDITIONAL(GUI_WIN32, test "x${gui_win32}" = "xyes") # qml +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], ,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 >= 4.6.0 ], ,gui_qml=no;gui_qml_reason="Packages QtDeclarative missing") + PKG_CHECK_MODULES(QT_DECLARATIVE, [QtDeclarative >= 4.7.0 ], AM_CONDITIONAL(QT_DECLARATIVE_NEWAPI,test "x${gui_qml}" = "xyes"), ) fi if test "x${gui_qml}" = "xyes" ; then AC_DEFINE(USE_GUI_QML, 1, [Build with gui qml]) |