fix iconv signature problems

[supertux.git] / mk / autoconf / ax_check_gl.m4

diff --git a/mk/autoconf/ax_check_gl.m4 b/mk/autoconf/ax_check_gl.m4
index 0977fcd..08305c1 100644 (file)
--- a/mk/autoconf/ax_check_gl.m4
+++ b/mk/autoconf/ax_check_gl.m4
@@ -1,3 +1,19 @@
+dnl @synopsis AX_CHECK_GL
+dnl
+dnl Check for an OpenGL implementation. If GL is found, the required
+dnl compiler and linker flags are included in the output variables
+dnl "GL_CFLAGS" and "GL_LIBS", respectively. This macro adds the
+dnl configure option "--with-apple-opengl-framework", which users can
+dnl use to indicate that Apple's OpenGL framework should be used on Mac
+dnl OS X. If Apple's OpenGL framework is used, the symbol
+dnl "HAVE_APPLE_OPENGL_FRAMEWORK" is defined. If no GL implementation
+dnl is found, "no_gl" is set to "yes".
+dnl
+dnl @category InstalledPackages
+dnl @author Braden McDaniel <braden@endoframe.com>
+dnl @version 2004-11-15
+dnl @license AllPermissive
+
 AC_DEFUN([AX_CHECK_GL],
 [AC_REQUIRE([AC_PATH_X])dnl
 AC_REQUIRE([ACX_PTHREAD])dnl
@@ -13,10 +29,15 @@ AC_ARG_WITH([apple-opengl-framework],
 if test "X$with_apple_opengl_framework" = "Xyes"; then
   AC_DEFINE([HAVE_APPLE_OPENGL_FRAMEWORK], [1],
             [Use the Apple OpenGL framework.])
-  GL_CFLAGS="-framework OpenGL"
+  GL_LIBS="-framework OpenGL"
 else
-  GL_CFLAGS="${PTHREAD_CFLAGS}"
-  GL_LIBS="${PTHREAD_LIBS} -lm"
+  AC_LANG_PUSH(C)
+
+  AX_LANG_COMPILER_MS
+  if test X$ax_compiler_ms = Xno; then
+    GL_CFLAGS="${PTHREAD_CFLAGS}"
+    GL_LIBS="${PTHREAD_LIBS} -lm"
+  fi
 
   #
   # Use x_includes and x_libraries if they have been set (presumably by
@@ -31,8 +52,6 @@ else
     fi
   fi
 
-  AC_LANG_PUSH(C)
-
   AC_CHECK_HEADERS([windows.h])
 
   AC_CACHE_CHECK([for OpenGL library], [ax_cv_check_gl_libgl],
@@ -42,20 +61,20 @@ else
   ax_save_LIBS="${LIBS}"
   LIBS=""
   ax_check_libs="-lopengl32 -lGL"
-    for ax_lib in ${ax_check_libs}; do
-    if test "X$CC" = "Xcl"; then
+  for ax_lib in ${ax_check_libs}; do
+    if test X$ax_compiler_ms = Xyes; then
       ax_try_lib=`echo $ax_lib | sed -e 's/^-l//' -e 's/$/.lib/'`
     else
       ax_try_lib="${ax_lib}"
     fi
     LIBS="${ax_try_lib} ${GL_LIBS} ${ax_save_LIBS}"
-    AC_TRY_LINK([
+    AC_LINK_IFELSE(
+    [AC_LANG_PROGRAM([[
 # if HAVE_WINDOWS_H && defined(_WIN32)
 #   include <windows.h>
 # endif
-# include <GL/gl.h>
-],
-    [glBegin(0)],
+# include <GL/gl.h>]],
+                     [[glBegin(0)]])],
     [ax_cv_check_gl_libgl="${ax_try_lib}"; break])
   done
   LIBS=${ax_save_LIBS}