Ticket #463: scourge-0.21.1.patch

configure.in

@@ -310 +310 @@
     AC_MSG_ERROR([Cannot find GL library])
 fi
 
-dnl Check for glXGetProcAddressARB
-AC_CHECK_FUNCS( glXGetProcAddressARB, has_glx_get_proc=yes, 
+dnl Check for glutGetProcAddress
+AC_CHECK_FUNCS( glutGetProcAddress, has_glx_get_proc=yes, 
                 has_glx_get_proc=no )
 
 LIBS="$saved_LIBS"
@@ -472 +472 @@
 
 if test "x$has_glx_get_proc" = "xyes" ; then 
 
-    dnl Check for glx.h
-    AC_CHECK_HEADERS([GL/glx.h], have_glx_h=yes, have_glx_h=no )
+    dnl Check for glut.h
+    AC_CHECK_HEADERS([GL/glut.h], have_glx_h=yes, have_glx_h=no )
 
     if test "x$have_glx_h" = "xno" ; then
-        AC_MSG_ERROR([Cannot find GL/glx.h])
+        AC_MSG_ERROR([Cannot find GL/glut.h])
     fi
 
-    dnl Check that glXGetProcAddressARB is defined in glx.h
-    dnl AC_MSG_CHECKING([whether glx.h defines glXGetProcAddressARB]);
-    dnl AC_TRY_COMPILE( [#include <GL/glx.h>], [ char *foo = (char*) glXGetProcAddressARB; ],
+    dnl Check that glutGetProcAddress is defined in glut.h
+    dnl AC_MSG_CHECKING([whether glut.h defines glutGetProcAddress]);
+    dnl AC_TRY_COMPILE( [#include <GL/glut.h>], [ char *foo = (char*) glutGetProcAddress; ],
     dnl                 glx_h_up_to_date=yes, glx_h_up_to_date=no )
     dnl AC_MSG_RESULT([$glx_h_up_to_date])
 
     dnl if test "x$glx_h_up_to_date" = "xno" ; then
-    dnl     AC_MSG_ERROR([Your copy of glx.h is out of date.  You can get a more recent copy from the latest Mesa distribution (http://mesa3d.sourceforge.net).])
+    dnl     AC_MSG_ERROR([Your copy of glut.h is out of date.  You can get a more recent copy from the latest Mesa distribution (http://mesa3d.sourceforge.net).])
     dnl fi
 fi
 
 dnl Check for glext.h 
 AC_CHECK_HEADERS( "GL/glext.h", have_glext_h=yes, have_glext_h=no )
 
-if test "x$have_glext_h" = "xno" ; then
-    AC_MSG_ERROR([
-*****************************************************************
-You are missing the file glext.h.
-You can get a copy at
-http://oss.sgi.com/projects/ogl-sample/ABI/glext.h
-Place it in the directory /usr/include/GL.
-*****************************************************************])
-fi
 
 dnl Check that glext.h version is recent enough
 AC_MSG_CHECKING([whether glext.h is recent enough]);

src/common/constants.h

@@ -167 +167 @@
 #  if defined( WIN32 )
 #    define DATA_DIR "./"DATA_DIR_NAME
 #  else
-#    define DATA_DIR "/usr/local/share/scourge"
+#    define DATA_DIR "/boot/apps/scourge"
 #  endif /* defined( WIN32 ) */
 #endif