Core:Fix:Further cleanup of build system

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

diff --git a/configure.in b/configure.in
index 96798f6..b1ca95b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -13,6 +13,7 @@ gui_gtk=no; gui_gtk_reason=default
 gui_win32=no; gui_win32_reason=default
 gui_internal=yes; gui_internal_reason=default
 graphics_gtk_drawing_area=no; graphics_gtk_drawing_area_reason=default
+graphics_qt_qpainter=yes; graphics_qt_qpainter_reason=default
 graphics_win32=no; graphics_win32_reason=default
 speech_cmdline=yes; speech_cmdline_reason=default
 speech_speech_dispatcher=yes; speech_speech_dispatcher_reason=default
@@ -179,16 +180,6 @@ AC_SUBST(DIRECTFB_CFLAGS)
 AC_SUBST(DIRECTFB_LIBS)
 AM_CONDITIONAL(DIRECTFB, [test "x$directfb_pkgconfig" = "xyes"])
 
-AC_ARG_ENABLE(graphics-qt-qpainter, [  --disable-graphics-qt-qpainter             don't create graphics qt-qpainter], enable_graphics_qt_qpainter=$enableval, enable_graphics_qt_qpainter=yes)
-if test "x${enable_graphics_qt_qpainter}" = "xyes" ; then
-       PKG_CHECK_MODULES(QT_GUI, [QtGui QtCore], ,enable_graphics_qt_qpainter=no)
-fi
-if test "x${enable_graphics_qt_qpainter}" = "xyes" ; then
-       AC_DEFINE(USE_GRAPICS_QT_QPAINTER, 1, [Build with graphics qt_qpainter])
-       AC_SUBST(QT_GUI_CFLAGS)
-       AC_SUBST(QT_GUI_LIBS)
-fi
-AM_CONDITIONAL(USE_GRAPHICS_QT_QPAINTER, test "x${enable_graphics_qt_qpainter}" = "xyes")
 
 AC_ARG_ENABLE(graphics-sdl, [  --disable-graphics-sdl             don't create graphics sdl], enable_graphics_sdl=$enableval, enable_graphics_sdl=yes)
 if test "x${enable_graphics_sdl}" = "xyes" ; then
@@ -610,7 +601,8 @@ win32=no
 case $host_os in
 wince)
        win32=yes
-       AC_DEFINE(HAS_WIN32_CE, 1, [Has Windows CE API])
+       AC_DEFINE(HAVE_API_WIN32_BASE, 1, [Have Windows Base API])
+       AC_DEFINE(HAVE_API_WIN32_CE, 1, [Have Windows CE API])
        gui_win32=yes; gui_win32_reason="host_os is wince"
        graphics_win32=yes; graphics_win32_reason="host_os is wince"
        ;;
@@ -629,6 +621,18 @@ AM_CONDITIONAL(GRAPHICS_GTK_DRAWING_AREA, [test "x${graphics_gtk_drawing_area}"
 # win32
 AC_ARG_ENABLE(graphics-win32, [  --disable-graphics-win32            disable graphics type win32], graphics_win32=$enableval;graphics_win32_reason="configure parameter")
 AM_CONDITIONAL(GRAPHICS_WIN32, test "x${graphics_win32}" = "xyes")
+# qt_qpainter
+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")
+echo "  qt_qpainter:       $graphics_qt_qpainter ($graphics_qt_qpainter_reason)"
+if test "x${graphics_qt_qpainter}" = "xyes" -a "x${QT_GUI_CFLAGS}" = "x" -a "x${QT_GUI_LIBS}" = "x"; then
+       PKG_CHECK_MODULES(QT_GUI, [QtGui QtCore], ,graphics_qt_qpainter=no,graphics_qt_qpainter_reason="Packages QtGui and/or QtCore missing")
+fi
+if test "x${graphics_qt_qpainter}" = "xyes" ; then
+       AC_DEFINE(USE_GRAPICS_QT_QPAINTER, 1, [Build with graphics qt_qpainter])
+fi
+AC_SUBST(QT_GUI_CFLAGS)
+AC_SUBST(QT_GUI_LIBS)
+AM_CONDITIONAL(GRAPHICS_QT_QPAINTER, test "x${graphics_qt_qpainter}" = "xyes")
 
 ## gui
 # gtk
@@ -806,6 +810,7 @@ echo "Postgresql:          $postgresql ($postgresql_reason)"
 echo "Samplemap:           $samplemap ($samplemap_reason)"
 echo "Graphics types:"
 echo "  gtk_drawing_area:  $graphics_gtk_drawing_area ($graphics_gtk_drawing_area_reason)"
+echo "  qt_qpainter:       $graphics_qt_qpainter ($graphics_qt_qpainter_reason)"
 echo "  win32:             $graphics_win32 ($graphics_win32_reason)"
 
 echo "GUI types:"

diff --git a/navit/graphics/Makefile.am b/navit/graphics/Makefile.am
index 692c342..10d4bb9 100644 (file)
--- a/navit/graphics/Makefile.am
+++ b/navit/graphics/Makefile.am
@@ -11,7 +11,7 @@ if GUI_CLUTTER
   SUBDIRS+=cogl
 endif
 endif
-if USE_GRAPHICS_QT_QPAINTER
+if GRAPHICS_QT_QPAINTER
   SUBDIRS+=qt_qpainter
 endif
 if USE_GRAPHICS_SDL