From: kazer_ Date: Thu, 12 Mar 2009 14:02:44 +0000 (+0000) Subject: Update:Gui:Removing deprecated guis X-Git-Tag: navit-0.5.0.5194svn~3052 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d7c0adaa9f032eb5df4d48d062a0eb87ea892f2c;p=profile%2Fivi%2Fnavit.git Update:Gui:Removing deprecated guis git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@2106 ffa7fe5e-494d-0410-b361-a75ebd5db220 --- diff --git a/navit/configure.in b/navit/configure.in index 1a7d443..647da0a 100644 --- a/navit/configure.in +++ b/navit/configure.in @@ -334,19 +334,6 @@ if test "x$MODULE_GUI_SDL" = "xyes"; then ) fi -PKG_CHECK_MODULES( - [CEGUI], - [CEGUI-OPENGL >= 0.5.0], - [ - AC_DEFINE( - [HAVE_CEGUI], - [], - [Define to 1 if you have the @<:@CEGUI/CEGUI.h@:>@ header file.]) - cegui=yes - ], - [AC_MSG_WARN([*** CEGUI not found -- SDL support disabled])] -) - AC_CHECK_HEADER( X11/Xmu/Xmu.h, AC_DEFINE( @@ -402,108 +389,9 @@ AC_SUBST(GLC_CFLAGS) AC_SUBST(GLC_LIBS) fi -if test x"$cegui" = xyes - then - # Save the LIBS into a temp var since AC_CHECK_LIB adds the lib into LIBS - # and we want just to check and use CEGUI_LIBS - libstemp="$LIBS" - # For CEGUI, we have to check the presence of some libraries. - # The following are mandatory (used by navit) - # If the user installed NavIt without, issue a warning and disable CEGUI - AC_CHECK_LIB(CEGUIBase, main, - [], - [ - echo "Error! Something is wrong with CEGUIBase. Do you have at least cegui-0.5?" - ]) - AC_CHECK_LIB(CEGUIOpenGLRenderer, main, - [], - [ - echo "Error! Something is wrong with CEGUIOpenGLRenderer. Do you have at least cegui-0.5? " - ], $OPENGL_LIBS ) - AC_CHECK_LIB(CEGUIFalagardWRBase, main, - [], - [ - echo "Error! Something is wrong with CEGUIFalagardWRBase. Do you have at least cegui-0.5?" - ], $OPENGL_LIBS) - CEGUI_LIBS="-lCEGUIBase -lCEGUIOpenGLRenderer -lCEGUIFalagardWRBase" - - # The following are optional, but we need to link against them if cegui was built with them - AC_CHECK_LIB(CEGUIXercesParser, main, - [CEGUI_LIBS="$CEGUI_LIBS -lCEGUIXercesParser"], - [echo "CEGUIXercesParser not found/not working, disabled."], - $OPENGL_LIBS - ) - - AC_CHECK_LIB(CEGUIExpatParser, main, - [CEGUI_LIBS="$CEGUI_LIBS -lCEGUIExpatParser"], - [echo "CEGUIExpatParser not found/not working, disabled."], - $OPENGL_LIBS - ) - - AC_CHECK_LIB(CEGUILibxmlParser, main, - [CEGUI_LIBS="$CEGUI_LIBS -lCEGUILibxmlParser"], - [echo "CEGUILibxmlParser not found/not working, disabled."], - $OPENGL_LIBS - ) - - AC_CHECK_LIB(CEGUITinyXMLParser, main, - [CEGUI_LIBS="$CEGUI_LIBS -lCEGUITinyXMLParser"], - [echo "CEGUITinyXMLParser not found/not working, disabled."], - $OPENGL_LIBS - ) - - AC_CHECK_LIB(CEGUIDevILImageCodec, main, - [ - CEGUI_LIBS="$CEGUI_LIBS -lCEGUIDevILImageCodec" - AC_DEFINE([HAVE_LIBCEGUIDEVILIMAGECODEC],[1],Define to 1 to use DevIL codec) - ], - [echo "CEGUIDevILImageCodec not found/not working, disabled."], - $OPENGL_LIBS - ) - - AC_CHECK_LIB(CEGUITGAImageCodec, createImageCodec, - [ - CEGUI_LIBS="$CEGUI_LIBS -lCEGUITGAImageCodec" - AC_DEFINE(HAVE_LIBCEGUITGAIMAGECODEC,[1],Define to 1 to use the TGA codec) - ], - [echo "GUITGAImageCodec not found/not working, disabled."], - $OPENGL_LIBS - ) - - libssilly="$OPENGL_LIBS -lpng" - AC_CHECK_LIB(CEGUISILLYImageCodec, createImageCodec, - [ - CEGUI_LIBS="$CEGUI_LIBS -lCEGUISILLYImageCodec" - AC_DEFINE([HAVE_LIBCEGUISILLYIMAGECODEC],[1],Define to 1 to use SILLY codec) - ], - [echo "CEGUISILLYImageCodec not found/not working, disabled."], - $libssilly - ) - # Restore the libs - LIBS="$libstemp" - echo "CEGUI_LIBS : $CEGUI_LIBS" - fi - -AC_SUBST(CEGUI_CFLAGS) -AC_SUBST(CEGUI_LIBS) - -AM_CONDITIONAL(GUI_SDL, [test "x$sdl" = "xyes" -a "x$cegui" = "xyes" -a "x$opengl" = "xyes" -a "x$glc" = "xyes" -a "x$xmu" = "xyes" ]) +AM_CONDITIONAL(GUI_SDL, [test "x$sdl" = "xyes" -a "x$opengl" = "xyes" -a "x$glc" = "xyes" -a "x$xmu" = "xyes" ]) AM_CONDITIONAL(GRAPHICS_OPENGL, [test "x$glut" = "xyes" - "x$opengl" = "xyes" -a "x$glc" = "xyes" ]) -AC_ARG_ENABLE(gui-clutter, [ --disable-gui-clutter don't create gui clutter ], MODULE_GUI_CLUTTER=$enableval, MODULE_GUI_CLUTTER=yes) -if test "x$MODULE_GUI_CLUTTER" = "xyes"; then - PKG_CHECK_MODULES(CLUTTER, [clutter-0.8], [clutter_pkgconfig=yes], [clutter_pkgconfig=no]) - if test "x$clutter_pkgconfig" = "xyes"; then - AC_DEFINE(HAVE_CLUTTER, 1, [Define to 1 if you have clutter]) - fi -fi - -AC_SUBST(CLUTTER_CFLAGS) -AC_SUBST(CLUTTER_LIBS) -AM_CONDITIONAL(GUI_CLUTTER, [test "x$clutter_pkgconfig" = "xyes" -a "x$glc" = "xyes" ]) - - - if test x"${USE_GARMIN}" = xyes then @@ -859,9 +747,6 @@ navit/graphics/win32/Makefile navit/gui/Makefile navit/gui/gtk/Makefile navit/gui/internal/Makefile -navit/gui/clutter/Makefile -navit/gui/cegui/Makefile -navit/gui/cegui/datafiles/Makefile navit/gui/directfb/Makefile navit/gui/win32/Makefile navit/osd/Makefile @@ -912,10 +797,6 @@ if test x"$glc" != xyes then sdl_failures=$sdl_failures"quesoglc " fi -if test x"$cegui" != xyes - then - sdl_failures=$sdl_failures"cegui-devel >= 0.5 " -fi if test -z "$sdl_failures" then echo "OpenGL gui : ENABLED, with $CEGUI_LIBS" @@ -928,12 +809,6 @@ if test x"$directfb_pkgconfig" = xyes else echo "DIRECTFB : DISABLED" fi -if test x"$clutter_pkgconfig" = xyes - then - echo "Clutter gui : ENABLED" - else - echo "Clutter gui : DISABLED" -fi if test x"$enable_hildon" = xyes then echo "Maemo/Hildon: ENABLED"