Update of /cvsroot/simspark/simspark/spark
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv17231
Modified Files:
Tag: WIN32
acinclude.m4
Log Message:
- included checks for the OpenGL stuff on a Mac
- removed the checks that were needed to build the glextreg stuff
Index: acinclude.m4
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/acinclude.m4,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -d -r1.4 -r1.4.2.1
*** acinclude.m4 8 Mar 2006 17:07:54 -0000 1.4
--- acinclude.m4 13 Feb 2007 00:01:49 -0000 1.4.2.1
***************
*** 144,167 ****
#-----------------------------------------------------------------------------
AC_DEFUN([RCSS_CHECK_GL], [
! RCSS_KEROSIN_IF_ELSE([
! # check for OpenGL location and used extensions
! AC_CHECK_HEADERS([GL/gl.h GL/glut.h],,
! RCSS_BUILD_KEROSIN_ERROR([not all required OpenGL headers could not be found. Please specify the location of the OpenGL header directory using the CPPFLAGS environment variable]))
! RCSS_KEROSIN_IF_ELSE([
! AC_CHECK_HEADERS([GL/glx.h], AC_SUBST([GLTARGET], [x]),
! AC_CHECK_HEADERS([GL/wglext.h],
! AC_SUBST([GLTARGET], [win32]),
! RCSS_BUILD_KEROSIN_ERROR([could not find
! X nor MS Windows GL extensions]),
! [#include <GL/gl.h>]),
! [#include <GL/gl.h>])
!
! # subst'ing the directory where the prepocessor finds gl.h
! GLDIR=`echo "#include <GL/gl.h>" | /lib/cpp -M | awk '{ print @S|@2 }'`
! GLDIR=`dirname "$GLDIR"`
! AC_SUBST([GLDIR], [$GLDIR])
!
# checking if linking against libGL succeeds
! RCSS_KEROSIN_IF_ELSE([
AC_MSG_CHECKING([if linking against libGL succeeds])
rcss_tmp="$LDFLAGS"
--- 144,176 ----
#-----------------------------------------------------------------------------
AC_DEFUN([RCSS_CHECK_GL], [
! AC_CHECK_HEADERS([OpenGL/gl.h GLUT/glut.h], [iamamac=yes], [iamamac=no])
! AC_MSG_CHECKING([if I am a Mac])
! if test "$iamamac" = "yes"; then
! AC_MSG_RESULT([yes!])
! RCSS_KEROSIN_IF_ELSE([
# checking if linking against libGL succeeds
! AC_MSG_CHECKING([if linking against libGL succeeds])
! rcss_tmp="$LDFLAGS"
! LDFLAGS="$LDFLAGS -framework GLUT -framework OpenGL"
! AC_LINK_IFELSE([#include <OpenGL/gl.h>
! int main() { glColor3f(0,0,0); }],
! [AC_MSG_RESULT([yes])],
! [AC_MSG_RESULT([no])
! RCSS_BUILD_KEROSIN_ERROR([to build libkerosin, set LDFLAGS so that libGL can be found])])
! LDFLAGS="$rcss_tmp"
! AC_MSG_CHECKING([if linking against libglut succeeds])
! LDFLAGS="$LDFLAGS -framework GLUT -framework OpenGL"
! AC_LINK_IFELSE([#include <GLUT/glut.h>
! int main() { glutMainLoop(); }],
! [AC_MSG_RESULT([yes])],
! [AC_MSG_RESULT([no])
! RCSS_BUILD_KEROSIN_ERROR([to build libkerosin, set LDFLAGS so that libglut or can be found])
! ])
! LDFLAGS="$rcss_tmp"
! ])
! else
! AC_MSG_RESULT([sorry])
! # checking if linking against libGL succeeds
! RCSS_KEROSIN_IF_ELSE([
AC_MSG_CHECKING([if linking against libGL succeeds])
rcss_tmp="$LDFLAGS"
***************
*** 182,188 ****
])
LDFLAGS="$rcss_tmp"
! ])
! ])
! ])
]) # RCSS_CHECK_GL
--- 191,196 ----
])
LDFLAGS="$rcss_tmp"
! ])
! fi
]) # RCSS_CHECK_GL
|
