Fix:Build:Check for quesoglc, correct ezxml setting

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

diff --git a/navit/CMakeLists.txt b/navit/CMakeLists.txt
index b144648..0a34a30 100644 (file)
--- a/navit/CMakeLists.txt
+++ b/navit/CMakeLists.txt
@@ -37,7 +37,7 @@ add_module(speech/dbus FALSE)
 add_module(speech/espeak FALSE)
 add_module(speech/speech_dispatcher TRUE)
 add_plugin(support/espeak FALSE)
-add_plugin(support/ezxml TRUE)
+add_plugin(support/ezxml FALSE)
 add_plugin(support/glib FALSE)
 add_plugin(support/libpng FALSE)
 add_plugin(support/win32 FALSE)
@@ -76,6 +76,7 @@ set(LIB_DIR lib)
 # set platform defaults
 if(WIN32)
    set_with_reason(graphics/win32 "win32" TRUE)
+   set_with_reason(support/ezxml "win32" TRUE)
    set_with_reason(support/glib "win32" TRUE)
    set_with_reason(support/libpng "win32" TRUE)
    set_with_reason(support/win32 "win32" TRUE)
@@ -187,8 +188,11 @@ endif(ZLIB_FOUND)
 
 # OpenGL
 if (graphics/opengl)
-   CHECK_INCLUDE_FILES(glc.h HAVE_GLC)
-   if (NOT HAVE_GLC)
+   find_package(PkgConfig)
+   if(PKG_CONFIG_FOUND)
+      pkg_check_modules(QUESOGLC quesoglc)
+   endif(PKG_CONFIG_FOUND)
+   if (NOT QUESOGLC_FOUND)
       set(graphics/opengl FALSE)
       message (STATUS "no glc implementation found. Install Quesoglc for OpenGL support")
    else()
@@ -200,7 +204,7 @@ if (graphics/opengl)
          set(graphics/opengl FALSE)
          message (STATUS "opengl not found")
       endif()   
-   endif(NOT HAVE_GLC)
+   endif(NOT QUESOGLC_FOUND)
 endif()
 
 # SDL