1 diff -Naur navit-0.5.0/configure.in navit-0.5.0-new/configure.in
2 --- navit-0.5.0/configure.in 2012-02-13 16:20:55.000000000 -0800
3 +++ navit-0.5.0-new/configure.in 2012-03-27 16:05:40.141883867 -0700
5 graphics=yes; graphics_reason=default
6 graphics_gd=no; graphics_gd_reason=default
7 graphics_gtk_drawing_area=no; graphics_gtk_drawing_area_reason=default
8 -graphics_qt_qpainter=yes; graphics_qt_qpainter_reason=default
9 +graphics_qt_qpainter_wayland=no; graphics_qt_qpainter_wayland_reason=default
10 +graphics_qt_qpainter_xlib=no; graphics_qt_qpainter_xlib_reason=default
11 graphics_null=yes; graphics_null_reason=default
12 graphics_opengl=yes; graphics_opengl_reason=default
13 graphics_sdl=yes; graphics_sdl_reason=default
16 AC_ARG_ENABLE(graphics-win32, [ --disable-graphics-win32 disable graphics type win32], graphics_win32=$enableval;graphics_win32_reason="configure parameter")
17 AM_CONDITIONAL(GRAPHICS_WIN32, test "x${graphics_win32}" = "xyes")
19 -AC_ARG_ENABLE(graphics-qt-qpainter, [ --disable-graphics-qt-qpainter disable graphics type qt-qpainter], graphics_qt_qpainter=$enableval;graphics_qt_qpainter_reason="configure parameter")
20 -if test "x${graphics_qt_qpainter}" = "xyes" -a "x${QT_GUI_CFLAGS}" = "x" -a "x${QT_GUI_LIBS}" = "x"; then
21 - PKG_CHECK_MODULES(QT_GUI, [QtGui QtCore],graphics_qt_qpainter=yes,graphics_qt_qpainter=no;graphics_qt_qpainter_reason="Packages QtGui and/or QtCore missing")
22 - if test "x${graphics_qt_qpainter}" = "xno"; then
23 - PKG_CHECK_MODULES(QT_GUI, [qt-mt],graphics_qt_qpainter=yes;graphics_qt_qpainter_reason="Package qt-mt present",graphics_qt_qpainter=no)
25 +AC_ARG_ENABLE(graphics-qt-qpainter-wayland, [ --disable-graphics-qt-qpainter-wayland disable graphics type qt-qpainter-wayland], graphics_qt_qpainter_wayland=$enableval;graphics_qt_qpainter_wayland_reason="configure parameter")
26 +AC_ARG_ENABLE(graphics-qt-qpainter-xlib, [ --disable-graphics-qt-qpainter-xlib disable graphics type qt-qpainter-xlib], graphics_qt_qpainter_xlib=$enableval;graphics_qt_qpainter_xlib_reason="configure parameter")
27 +QT_GUI_CFLAGS="-DQT_SHARED -I/usr/include/qt4 -I/usr/include/qt4/Qt -I/usr/include/qt4/QtGui"
28 +QT_SVG_CFLAGS="-DQT_SHARED -I/usr/include/qt4 -I/usr/include/qt4/Qt -I/usr/include/qt4/QtSvg"
29 +if test "x${graphics_qt_qpainter_wayland}" = "xyes"; then
30 +QT_GUI_LIBS="-lQtGui-wayland"
31 +QT_SVG_LIBS="-lQtSvg-wayland"
33 +if test "x${graphics_qt_qpainter_xlib}" = "xyes"; then
34 +QT_GUI_LIBS="-lQtGui-xlib"
35 +QT_SVG_LIBS="-lQtSvg-xlib"
37 +if test "x${graphics_qt_qpainter_wayland}" = "xyes" -a "x${QT_GUI_CFLAGS}" = "x" -a "x${QT_GUI_LIBS}" = "x"; then
38 + PKG_CHECK_MODULES(QT_GUI, [QtGui-wayland QtCore-wayland],graphics_qt_qpainter_wayland=yes,graphics_qt_qpainter_wayland=no;graphics_qt_qpainter_reason-_ayland="Packages QtGui-wayland and/or QtCore-wayland missing")
39 + if test "x${graphics_qt_qpainter_wayland}" = "xno"; then
40 + PKG_CHECK_MODULES(QT_GUI, [qt-mt],graphics_qt_qpainter_wayland=yes;graphics_qt_qpainter-wayland_reason="Package qt-mt present",graphics_qt_qpainter_wayland=no)
43 -if test "x${graphics_qt_qpainter}" = "xyes" ; then
44 - PKG_CHECK_MODULES(QT_SVG, [QtSvg], have_qt_svg=yes, have_qt_svg=no)
45 - if test "x${have_qt_svg}" = "xyes"; then
46 +if test "x${graphics_qt_qpainter_xlib}" = "xyes" -a "x${QT_GUI_CFLAGS}" = "x" -a "x${QT_GUI_LIBS}" = "x"; then
47 + PKG_CHECK_MODULES(QT_GUI, [QtGui-xlib QtCore-xlib],graphics_qt_qpainter_xlib=yes,graphics_qt_qpainter_xlib=no;graphics_qt_qpainter_xlib_reason="Packages QtGui-xlib and/or QtCore-xlib missing")
48 + if test "x${graphics_qt_qpainter_xlib}" = "xno"; then
49 + PKG_CHECK_MODULES(QT_GUI, [qt-mt],graphics_qt_qpainter_xlib=yes;graphics_qt_qpainter_xlib_reason="Package qt-mt present",graphics_qt_qpainter_xlib=no)
52 +if test "x${graphics_qt_qpainter_wayland}" = "xyes" ; then
53 + PKG_CHECK_MODULES(QT_SVG, [QtSvg-wayland], have_qt_svg_wayland=yes, have_qt_svg_wayland=no)
54 + if test "x${have_qt_svg_wayland}" = "xyes"; then
55 + AC_DEFINE([HAVE_QT_SVG],[],Define to 1 if qt supports svg)
58 +if test "x${graphics_qt_qpainter_xlib}" = "xyes" ; then
59 + PKG_CHECK_MODULES(QT_SVG, [QtSvg-xlib], have_qt_svg_xlib=yes, have_qt_svg_xlib=no)
60 + if test "x${have_qt_svg-xlib}" = "xyes"; then
61 AC_DEFINE([HAVE_QT_SVG],[],Define to 1 if qt supports svg)
64 -if test "x${graphics_qt_qpainter}" = "xyes" ; then
65 - AC_DEFINE(USE_GRAPICS_QT_QPAINTER, 1, [Build with graphics qt_qpainter])
66 +if test "x${graphics_qt_qpainter_wayland}" = "xyes" ; then
67 + AC_DEFINE(USE_GRAPHICS_QT_QPAINTER_WAYLAND, 1, [Build with graphics qt_qpainter_wayland])
69 +if test "x${graphics_qt_qpainter_xlib}" = "xyes" ; then
70 + AC_DEFINE(USE_GRAPHICS_QT_QPAINTER_XLIB, 1, [Build with graphics qt_qpainter_xlib])
72 AC_SUBST(QT_GUI_CFLAGS)
74 AC_SUBST(QT_SVG_CFLAGS)
76 -AM_CONDITIONAL(GRAPHICS_QT_QPAINTER, test "x${graphics_qt_qpainter}" = "xyes")
77 +AM_CONDITIONAL(GRAPHICS_QT_QPAINTER, [test "x${graphics_qt_qpainter_wayland}" = "xyes" || test "x${graphics_qt_qpainter_xlib}" = "xyes"])
78 MOC=`$PKG_CONFIG QtGui --variable=moc_location`
79 if test "x${MOC}" = "x"; then
80 AC_CHECK_PROG(MOC, moc, moc)
82 echo " android: $graphics_android ($graphics_android_reason)"
83 echo " gtk_drawing_area: $graphics_gtk_drawing_area ($graphics_gtk_drawing_area_reason)"
84 echo " null: $graphics_null ($graphics_null_reason)"
85 -echo " qt_qpainter: $graphics_qt_qpainter ($graphics_qt_qpainter_reason)"
86 +echo " qt_qpainter-wayland: $graphics_qt_qpainter_wayland ($graphics_qt_qpainter_wayland_reason)"
87 +echo " qt_qpainter-xlib: $graphics_qt_qpainter_xlib ($graphics_qt_qpainter_xlib_reason)"
88 echo " win32: $graphics_win32 ($graphics_win32_reason)"
89 echo " OpenGL: $graphics_opengl ($graphics_opengl_reason)"
90 echo " gd: $graphics_gd ($graphics_gd_reason)"