[Vm-dev] [commit] r2123 - do not look for gl.h unless GL has been found

commits at squeakvm.org commits at squeakvm.org
Mon Aug 31 22:57:46 UTC 2009


Author: piumarta
Date: 2009-08-31 15:57:45 -0700 (Mon, 31 Aug 2009)
New Revision: 2123

Modified:
   trunk/platforms/unix/ChangeLog
   trunk/platforms/unix/plugins/B3DAcceleratorPlugin/config.cmake
Log:
do not look for gl.h unless GL has been found

Modified: trunk/platforms/unix/ChangeLog
===================================================================
--- trunk/platforms/unix/ChangeLog	2009-08-31 21:40:47 UTC (rev 2122)
+++ trunk/platforms/unix/ChangeLog	2009-08-31 22:57:45 UTC (rev 2123)
@@ -1,3 +1,8 @@
+2009-08-31    <piumarta at ubuntu.piumarta.com>
+
+	* plugins/B3DAcceleratorPlugin/config.cmake: Don't look for gl.h
+	unless some kind of GL was already found.
+
 2009-08-31  Ian Piumarta  <com -dot- gmail -at- piumarta (backwards)>
 
 	* plugins/SqueakFFIPrims/config.cmake: Compile .S using gcc if

Modified: trunk/platforms/unix/plugins/B3DAcceleratorPlugin/config.cmake
===================================================================
--- trunk/platforms/unix/plugins/B3DAcceleratorPlugin/config.cmake	2009-08-31 21:40:47 UTC (rev 2122)
+++ trunk/platforms/unix/plugins/B3DAcceleratorPlugin/config.cmake	2009-08-31 22:57:45 UTC (rev 2123)
@@ -14,7 +14,9 @@
   SET (HAVE_OPENGL_GL_H 1)
 ENDIF ()
 
-CHECK_INCLUDE_FILE (GL/gl.h HAVE_GL_GL_H -I${OPENGL_INCLUDE_DIR})
+IF (OPENGL_FOUND OR AGL_FOUND)
+  CHECK_INCLUDE_FILE (GL/gl.h HAVE_GL_GL_H -I${OPENGL_INCLUDE_DIR})
+ENDIF (OPENGL_FOUND OR AGL_FOUND)
 
 CONFIG_DEFINE (USE_OPENGL)
 CONFIG_DEFINE (USE_X11_GLX)



More information about the Vm-dev mailing list