From: <za...@us...> - 2008-10-31 14:17:54
|
Revision: 1623 http://navit.svn.sourceforge.net/navit/?rev=1623&view=rev Author: zaxl Date: 2008-10-31 14:17:50 +0000 (Fri, 31 Oct 2008) Log Message: ----------- FIX:build: Make it possible to disable opengl graphics Modified Paths: -------------- trunk/navit/configure.in Modified: trunk/navit/configure.in =================================================================== --- trunk/navit/configure.in 2008-10-31 14:17:23 UTC (rev 1622) +++ trunk/navit/configure.in 2008-10-31 14:17:50 UTC (rev 1623) @@ -14,6 +14,7 @@ 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_opengl=yes; graphics_opengl_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 @@ -307,6 +308,9 @@ AC_MSG_WARN([*** no X11/Xmu/Xmu.h -- opengl and SDL support disabled]) ) +AC_ARG_ENABLE(graphics-opengl, [ --disable-graphics-opengl disable graphics type OpenGL], graphics_opengl=$enableval;graphics_opengl_reason="configure parameter") +if test "x${graphics_opengl}" = "xyes" ; then + AC_CHECK_HEADER( GL/gl.h, AC_DEFINE( @@ -316,7 +320,7 @@ ) OPENGL_LIBS="$X_LIBS -lGL -lGLU" opengl=yes, - AC_MSG_WARN([*** no GL/gl.h -- opengl and SDL support disabled]) + AC_MSG_WARN([*** no GL/gl.h -- opengl and SDL support disabled];graphics_opengl=no;graphics_opengl_reason="Headers missing") ) AC_CHECK_HEADER( @@ -327,7 +331,7 @@ Define to 1 if you have the <GL/glut.h> header file. ) glut=yes, - AC_MSG_WARN([*** no GL/glut.h -- opengl and SDL support disabled]) + AC_MSG_WARN([*** no GL/glut.h -- opengl and SDL support disabled];graphics_opengl=no;graphics_opengl_reason="Headers missing") ) AC_SUBST(OPENGL_CFLAGS) @@ -346,6 +350,7 @@ ) AC_SUBST(GLC_CFLAGS) AC_SUBST(GLC_LIBS) +fi if test x"$cegui" = xyes then @@ -828,6 +833,7 @@ 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 " OpenGL: $graphics_opengl ($graphics_opengl_reason)" echo "GUI types:" echo " gtk: $gui_gtk ($gui_gtk_reason)" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |