Commit d4047e1a42b3d01dd617cfcef2f21a5e0df7c86a
2008-05-04T03:13:43
fix the gl/glut tests so that they also work on mac os x where libraries are specified through frameworks instead of libs. libtool 1.5 and earlier are unfortunately have busted behavior with -no-undefined libraries as it strips off unrecognized options, hence the use of -Xlinker
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93
diff --git a/m4/gl.m4 b/m4/gl.m4
index c117cb5..51f1280 100644
--- a/m4/gl.m4
+++ b/m4/gl.m4
@@ -34,7 +34,22 @@ else
fi
CPPFLAGS="$GL_CFLAGS"
-AC_CHECK_HEADER([GL/gl.h], [], [AC_MSG_ERROR([GL/gl.h is needed, please specify its location with --with-gl-inc. If this still fails, please contact mmagallo@debian.org, include the string FTGL somewhere in the subject line and provide a copy of the config.log file that was left behind.])])
+AC_CHECK_HEADER([GL/gl.h], [AC_DEFINE([HAVE_GL_GL_H], 1, [Define to 1 if you have the <GL/gl.h header])], [
+ AC_CHECK_HEADER([OpenGL/gl.h], [AC_DEFINE([HAVE_OPENGL_GL_H], 1, [Define to 1 if you have the <OpenGL/gl.h header])], [
+ AC_MSG_ERROR([GL/gl.h or OpenGL/gl.h is needed, please specify its location with --with-gl-inc. If this still fails, please contact henryj@paradise.net.nz, include the string FTGL somewhere in the subject line and provide a copy of the config.log file that was left behind.])
+ ])
+])
+
+dnl check whether the OpenGL framework is available
+AC_MSG_CHECKING([for OpenGL framework (Darwin-specific)])
+FRAMEWORK_OPENGL=""
+PRELDFLAGS="$LDFLAGS"
+LDFLAGS="$LDFLAGS -Xlinker -framework -Xlinker OpenGL"
+# -Xlinker is used because libtool is busted prior to 1.6 wrt frameworks
+AC_TRY_LINK([#include <OpenGL/gl.h>], [glBegin(GL_POINTS)],
+ [FRAMEWORK_OPENGL="-Xlinker -framework -Xlinker OpenGL" ; ac_cv_search_glBegin="-Xlinker -framework -Xlinker OpenGL" ; AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)])
+with_gl_lib="$FRAMEWORK_OPENGL"
+AC_SUBST(FRAMEWORK_OPENGL)
AC_MSG_CHECKING([for GL library])
if test "x$with_gl_lib" != "x" ; then
@@ -58,12 +73,23 @@ if test "x$HAVE_GL" = xyes ; then
GL_LIBS=$LIBS
else
AC_MSG_RESULT([no])
- AC_MSG_ERROR([GL library could not be found, please specify its location with --with-gl-lib. If this still fails, please contact mmagallo@debian.org, include the string FTGL somewhere in the subject line and provide a copy of the config.log file that was left behind.])
+ AC_MSG_ERROR([GL library could not be found, please specify its location with --with-gl-lib. If this still fails, please contact henryj@paradise.net.nz, include the string FTGL somewhere in the subject line and provide a copy of the config.log file that was left behind.])
fi
-AC_CHECK_HEADER([GL/glu.h])
+AC_CHECK_HEADER([GL/glu.h], [AC_DEFINE([HAVE_GL_GLU_H], 1, [Define to 1 if you have the <GL/glu.h header])], [
+ AC_CHECK_HEADER([OpenGL/glu.h], [AC_DEFINE([HAVE_OPENGL_GLU_H], 1, [Define to 1 if you have the <OpenGL/glu.h header])], [
+ AC_MSG_ERROR([GL/glu.h or OpenGL/glu.h is needed, please specify its location with --with-gl-inc. If this still fails, please contact henryj@paradise.net.nz, include the string FTGL somewhere in the subject line and provide a copy of the config.log file that was left behind.])
+ ])
+])
AC_MSG_CHECKING([for GLU version >= 1.2])
-AC_TRY_COMPILE([#include <GL/glu.h>], [
+AC_TRY_COMPILE([
+#ifdef HAVE_GL_GLU_H
+# include <GL/glu.h>
+#endif
+#ifdef HAVE_OPENGL_GLU_H
+# include <OpenGL/glu.h>
+#endif
+], [
#if !defined(GLU_VERSION_1_2)
#error GLU too old
#endif
@@ -87,7 +113,7 @@ if test "x$HAVE_GLU" = xyes ; then
GL_LIBS="$LIBS"
else
AC_MSG_RESULT([no])
- AC_MSG_ERROR([GLU library could not be found, please specify its location with --with-gl-lib. If this still fails, please contact mmagallo@debian.org, include the string FTGL somewhere in the subject line and provide a copy of the config.log file that was left behind.])
+ AC_MSG_ERROR([GLU library could not be found, please specify its location with --with-gl-lib. If this still fails, please contact henryj@paradise.net.nz, include the string FTGL somewhere in the subject line and provide a copy of the config.log file that was left behind.])
fi
AC_SUBST(GL_CFLAGS)
diff --git a/m4/glut.m4 b/m4/glut.m4
index bba7cda..4947189 100644
--- a/m4/glut.m4
+++ b/m4/glut.m4
@@ -75,6 +75,15 @@ if test "$ac_cv_have_glut" = "yes"; then
[ac_cv_have_glut=no])
fi
+ if test "$ac_cv_have_glut" = "no"; then
+ # Try again with GLUT framework
+ LIBS="-framework GLUT"
+ AC_LINK_IFELSE(
+ [AC_LANG_CALL([],[glutInit])],
+ [ac_cv_have_glut=yes],
+ [ac_cv_have_glut=no])
+ fi
+
if test "$ac_cv_have_glut" = "yes"; then
AC_MSG_RESULT([yes])
GLUT_LIBS="$LIBS"
@@ -84,7 +93,7 @@ if test "$ac_cv_have_glut" = "yes"; then
fi
if test "$ac_cv_have_glut" = "no"; then
- AC_MSG_WARN([GLUT headers not availabe, example program won't be compiled.])
+ AC_MSG_WARN([GLUT headers not available, example program won't be compiled.])
fi
AM_CONDITIONAL(HAVE_GLUT, [test "$ac_cv_have_glut" = "yes"])