Fix:Core:Better diagnostics about graphics_sdl

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

diff --git a/configure.in b/configure.in
index 2463f83..a6811a0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -45,6 +45,7 @@ graphics_gd=no; graphics_gd_reason=default
 graphics_gtk_drawing_area=no; graphics_gtk_drawing_area_reason=default
 graphics_qt_qpainter=yes; graphics_qt_qpainter_reason=default
 graphics_opengl=yes; graphics_opengl_reason=default
+graphics_sdl=yes; graphics_sdl_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
@@ -223,16 +224,17 @@ AC_TRY_LINK([#include <stdlib.h>], [system("/bin/true");],AC_MSG_RESULT(yes);AC_
 AC_MSG_CHECKING(for CreateProcess)
 AC_TRY_LINK([#include <windows.h>], [CreateProcess(NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL);],AC_MSG_RESULT(yes);AC_DEFINE(HAVE_CREATEPROCESS, 1, [Define to 1 if you have the `CreateProcess' function.]) speech_cmdline=yes; speech_cmdline_reason="CreateProcess exists", AC_MSG_RESULT(no))
 
-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
+AC_ARG_ENABLE(graphics-sdl, [  --disable-graphics-sdl             don't create graphics sdl], graphics_sdl=$enableval;graphics_sdl_reason="configure parameter")
+if test "x${graphics_sdl}" = "xyes" ; then
        if test -z "$SDL_CONFIG"; then
             AC_PATH_PROG([SDL_CONFIG], [sdl-config], [])
         fi
 fi
-if test "x${enable_graphics_sdl}" = "xyes" ; then
+if test "x${graphics_sdl}" = "xyes" ; then
         AC_MSG_CHECKING([for SDL libraries with $SDL_CONFIG])
        if test ! -x "$SDL_CONFIG"; then
-           enable_graphics_sdl = "no"
+           graphics_sdl = "no"
+           graphics_sdl_reason = "sdl-config not available"
             AC_MSG_RESULT([no])
        else
            SDL_CFLAGS="`$SDL_CONFIG --cflags`"
@@ -242,17 +244,17 @@ if test "x${enable_graphics_sdl}" = "xyes" ; then
             AC_MSG_RESULT([yes])
                fi 
 fi
-if test "x${enable_graphics_sdl}" = "xyes" ; then
+if test "x${graphics_sdl}" = "xyes" ; then
        save_CPPFLAGS=$CPPFLAGS
        CPPFLAGS="$($SDL_CONFIG --cflags) $CPPFLAGS"
-       AC_CHECK_HEADER(SDL_image.h,SDL_IMAGE_LIBS=-lSDL_image,enable_graphics_sdl=no)
+       AC_CHECK_HEADER(SDL_image.h,SDL_IMAGE_LIBS=-lSDL_image,graphics_sdl="no";graphics_sdl_reason="SDL_image.h missing")
        AC_SUBST(SDL_IMAGE_LIBS)
        CPPFLAGS=$save_CPPFLAGS
 fi
-if test "x${enable_graphics_sdl}" = "xyes" ; then
+if test "x${graphics_sdl}" = "xyes" ; then
        AC_DEFINE(USE_GRAPHICS_SDL, 1, [Build with graphics sdl])
 fi
-AM_CONDITIONAL(USE_GRAPHICS_SDL, test "x${enable_graphics_sdl}" = "xyes")
+AM_CONDITIONAL(USE_GRAPHICS_SDL, test "x${graphics_sdl}" = "xyes")
 
 AC_ARG_ENABLE(postgresql, [  --disable-postgresql             don't add postgresql support to osm2navit], postgresql=$enableval;postgresql_reason="configure parameter")
 if test "x${postgresql}" = "xyes" ; then
@@ -829,6 +831,7 @@ echo "  qt_qpainter:       $graphics_qt_qpainter ($graphics_qt_qpainter_reason)"
 echo "  win32:             $graphics_win32 ($graphics_win32_reason)"
 echo "  OpenGL:            $graphics_opengl ($graphics_opengl_reason)"
 echo "  gd:                $graphics_gd ($graphics_gd_reason)"
+echo "  sdl:               $graphics_sdl ($graphics_sdl_reason)"
 
 echo "GUI types:"
 echo "  gtk:               $gui_gtk ($gui_gtk_reason)"