Updated to latest version of GL autoconf macros (autoconf-gl-macros-2…

…0100321.tar.gz).

aclocal.m4

@@ -1062,7 +1062,7 @@ AC_SUBST([am__untar])
 m4_include([m4/pkg.m4])
 m4_include([m4/sdl.m4])
 m4_include([m4/freetype2.m4])
-m4_include([m4/acx_pthread.m4])
+m4_include([m4/ax_pthread.m4])
 m4_include([m4/ax_check_gl.m4])
 m4_include([m4/ax_check_glu.m4])
 m4_include([m4/ax_check_glut.m4])

m4/ax_check_gl.m4

@@ -11,7 +11,7 @@
 # "OpenGL/gl.h" is found, HAVE_OPENGL_GL_H is defined.  These preprocessor
 # definitions may not be mutually exclusive.
 #
-# version: 2.4
+# version: 2.6
 # author: Braden McDaniel <braden@endoframe.com>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -38,30 +38,31 @@ AC_DEFUN([AX_CHECK_GL],
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_PATH_X])dnl
 AC_REQUIRE([AC_PROG_SED])dnl
-AC_REQUIRE([ACX_PTHREAD])dnl
+AC_REQUIRE([AX_PTHREAD])dnl
 
 AC_LANG_PUSH([C])
 AX_LANG_COMPILER_MS
 AS_IF([test X$ax_compiler_ms = Xno],
-      [GL_CFLAGS="${PTHREAD_CFLAGS}"; GL_LIBS="${PTHREAD_LIBS} -lm"])
+      [GL_CFLAGS="${PTHREAD_CFLAGS}"; GL_LIBS="${PTHREAD_LIBS}"])
 
 #
 # Use x_includes and x_libraries if they have been set (presumably by
 # AC_PATH_X).
 #
-AS_IF([test X$no_x != Xyes],
-      [AS_IF([test -n "$x_includes"],
-             [GL_CFLAGS="-I$x_includes $GL_CFLAGS"])]
-       AS_IF([test -n "$x_libraries"],
-             [GL_LIBS="-L$x_libraries -lX11 $GL_LIBS"]))
+AS_IF([test X$no_x != Xyes -a -n "$x_includes"],
+      [GL_CFLAGS="-I$x_includes $GL_CFLAGS"])
+
+AC_CHECK_HEADERS([windows.h])
 
 ax_save_CPPFLAGS=$CPPFLAGS
 CPPFLAGS="$GL_CFLAGS $CPPFLAGS"
-AC_CHECK_HEADERS([GL/gl.h OpenGL/gl.h])
+AC_CHECK_HEADERS([GL/gl.h OpenGL/gl.h], , , [
+# if defined(HAVE_WINDOWS_H) && defined(_WIN32)
+#   include <windows.h>
+# endif
+])
 CPPFLAGS=$ax_save_CPPFLAGS
 
-AC_CHECK_HEADERS([windows.h])
-
 m4_define([AX_CHECK_GL_PROGRAM],
           [AC_LANG_PROGRAM([[
 # if defined(HAVE_WINDOWS_H) && defined(_WIN32)
@@ -76,38 +77,72 @@ m4_define([AX_CHECK_GL_PROGRAM],
 # endif]],
                            [[glBegin(0)]])])
 
+m4_define([AX_CHECK_GL_GLX_PROGRAM],
+          [AC_LANG_PROGRAM([[
+# if defined(HAVE_WINDOWS_H) && defined(_WIN32)
+#   include <windows.h>
+# endif
+# ifdef HAVE_GL_GL_H
+#   include <GL/gl.h>
+# elif defined(HAVE_OPENGL_GL_H)
+#   include <OpenGL/gl.h>
+# else
+#   error no gl.h
+# endif]],
+                           [[glXQueryVersion(0, 0, 0)]])])
+
 AC_CACHE_CHECK([for OpenGL library], [ax_cv_check_gl_libgl],
 [ax_cv_check_gl_libgl=no
 case $host_cpu in
   x86_64) ax_check_gl_libdir=lib64 ;;
   *)      ax_check_gl_libdir=lib ;;
 esac
 ax_save_CPPFLAGS=$CPPFLAGS
-CPPFLAGS="$GL_CFLAGS $CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $GL_CFLAGS"
+ax_save_LDFLAGS=$LDFLAGS
+AS_IF([test X$no_x != Xyes -a -n "$x_libraries"],
+      [LDFLAGS="$LDFLAGS -L$x_libraries"])
 ax_save_LIBS=$LIBS
-LIBS=""
 ax_check_libs="-lopengl32 -lGL"
 for ax_lib in $ax_check_libs; do
   AS_IF([test X$ax_compiler_ms = Xyes],
         [ax_try_lib=`echo $ax_lib | $SED -e 's/^-l//' -e 's/$/.lib/'`],
         [ax_try_lib=$ax_lib])
-  LIBS="$ax_try_lib $GL_LIBS $ax_save_LIBS"
+  LDFLAGS="$ax_save_LDFLAGS $GL_LIBS"
+  LIBS="$ax_try_lib $ax_save_LIBS"
 AC_LINK_IFELSE([AX_CHECK_GL_PROGRAM],
                [ax_cv_check_gl_libgl=$ax_try_lib; break],
-               [ax_check_gl_nvidia_flags="-L/usr/$ax_check_gl_libdir/nvidia" LIBS="$ax_try_lib $ax_check_gl_nvidia_flags $GL_LIBS $ax_save_LIBS"
-               AC_LINK_IFELSE([AX_CHECK_GL_PROGRAM],
-                              [ax_cv_check_gl_libgl="$ax_try_lib $ax_check_gl_nvidia_flags"; break],
-                              [ax_check_gl_dylib_flag='-dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib' LIBS="$ax_try_lib $ax_check_gl_dylib_flag $GL_LIBS $ax_save_LIBS"
-                              AC_LINK_IFELSE([AX_CHECK_GL_PROGRAM],
-                                             [ax_cv_check_gl_libgl="$ax_try_lib $ax_check_gl_dylib_flag"; break])])])
+               [ax_check_gl_nvidia_flags="-L/usr/$ax_check_gl_libdir/nvidia"
+                LDFLAGS="$ax_save_LDFLAGS $GL_LIBS $ax_check_gl_nvidia_flags"
+                AC_LINK_IFELSE([AX_CHECK_GL_PROGRAM],
+                               [ax_cv_check_gl_libgl="$ax_check_gl_nvidia_flags $ax_try_lib"; break],
+                               [ax_check_gl_dylib_flag='-dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib'
+                                LDFLAGS="$ax_save_LDFLAGS $GL_LIBS $ax_check_gl_dylib_flag"
+                                AC_LINK_IFELSE([AX_CHECK_GL_PROGRAM],
+                                               [ax_cv_check_gl_libgl="$ax_check_gl_dylib_flag $ax_try_lib"; break])])])
 done
 
+#
+# If no_x is "yes", we don't want to wind up using a libGL that is
+# linked with X11.  Test to see if the found libGL includes GLX
+# functions.  If it does and no_x is "yes", we want to reset
+# ax_cv_check_gl_libgl back to "no".
+#
+# Note that LDFLAGS and LIBS should still have whatever values they
+# had when we broke out of the test loop above; use that.
+#
+AS_IF([test "X$ax_cv_check_gl_libgl" != Xno],
+      [AC_LINK_IFELSE([AX_CHECK_GL_GLX_PROGRAM],
+                      [AS_IF([test X$no_x = Xyes],
+                             [ax_cv_check_gl_libgl=no])])])
+
+LIBS=$ax_save_LIBS
 AS_IF([test "X$ax_cv_check_gl_libgl" = Xno -a X$no_x = Xyes],
-      [LIBS='-framework OpenGL'
+      [LDFLAGS="$ax_save_LDFLAGS -framework OpenGL"
       AC_LINK_IFELSE([AX_CHECK_GL_PROGRAM],
-                     [ax_cv_check_gl_libgl=$LIBS])])
+                     [ax_cv_check_gl_libgl='-framework OpenGL'])])
 
-LIBS=$ax_save_LIBS
+LDFLAGS=$ax_save_LDFLAGS
 CPPFLAGS=$ax_save_CPPFLAGS])
 
 AS_IF([test "X$ax_cv_check_gl_libgl" = Xno],

m4/ax_check_glu.m4

@@ -15,7 +15,7 @@
 # rather than the standard "GLvoid (*)()".  If the former condition is
 # detected, this macro defines "HAVE_VARARGS_GLU_TESSCB".
 #
-# version: 2.2
+# version: 2.4
 # author: Braden McDaniel <braden@endoframe.com>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -45,7 +45,11 @@ GLU_CFLAGS=$GL_CFLAGS
 
 ax_save_CPPFLAGS=$CPPFLAGS
 CPPFLAGS="$GL_CFLAGS $CPPFLAGS"
-AC_CHECK_HEADERS([GL/glu.h OpenGL/glu.h])
+AC_CHECK_HEADERS([GL/glu.h OpenGL/glu.h], , , [
+# if defined(HAVE_WINDOWS_H) && defined(_WIN32)
+#   include <windows.h>
+# endif
+])
 CPPFLAGS=$ax_save_CPPFLAGS
 
 m4_define([AX_CHECK_GLU_PROGRAM],
@@ -66,13 +70,14 @@ AC_CACHE_CHECK([for OpenGL Utility library], [ax_cv_check_glu_libglu],
 [ax_cv_check_glu_libglu=no
 ax_save_CPPFLAGS=$CPPFLAGS
 CPPFLAGS="$GL_CFLAGS $CPPFLAGS"
+ax_save_LDFLAGS=$LDFLAGS
 ax_save_LIBS=$LIBS
 
 #
 # First, check for the possibility that everything we need is already in
 # GL_LIBS.
 #
-LIBS="$GL_LIBS $ax_save_LIBS"
+LDFLAGS="$ax_save_LDFLAGS $GL_LIBS"
 #
 # libGLU typically links with libstdc++ on POSIX platforms.
 # However, setting the language to C++ means that test program
@@ -85,26 +90,27 @@ AS_IF([test X$ax_compiler_ms = Xyes],
 AC_LINK_IFELSE([AX_CHECK_GLU_PROGRAM],
                [ax_cv_check_glu_libglu=yes],
                [LIBS=""
-               ax_check_libs="-lglu32 -lGLU"
-               for ax_lib in ${ax_check_libs}; do
-                 AS_IF([test X$ax_compiler_ms = Xyes],
-                       [ax_try_lib=`echo $ax_lib | $SED -e 's/^-l//' -e 's/$/.lib/'`],
-                       [ax_try_lib=$ax_lib])
-                 LIBS="$ax_try_lib $GL_LIBS $ax_save_LIBS"
-                 AC_LINK_IFELSE([AX_CHECK_GLU_PROGRAM],
-                                [ax_cv_check_glu_libglu=$ax_try_lib; break])
-               done])
+                ax_check_libs="-lglu32 -lGLU"
+                for ax_lib in ${ax_check_libs}; do
+                  AS_IF([test X$ax_compiler_ms = Xyes],
+                        [ax_try_lib=`echo $ax_lib | $SED -e 's/^-l//' -e 's/$/.lib/'`],
+                        [ax_try_lib=$ax_lib])
+                  LIBS="$ax_try_lib $ax_save_LIBS"
+                  AC_LINK_IFELSE([AX_CHECK_GLU_PROGRAM],
+                                 [ax_cv_check_glu_libglu=$ax_try_lib; break])
+                done])
 AS_IF([test X$ax_compiler_ms = Xyes],
       [AC_LANG_POP([C])])
 AC_LANG_POP([C++])
 
 LIBS=$ax_save_LIBS
+LDFLAGS=$ax_save_LDFLAGS
 CPPFLAGS=$ax_save_CPPFLAGS])
 AS_IF([test "X$ax_cv_check_glu_libglu" = Xno],
       [no_glu=yes; GLU_CFLAGS=""; GLU_LIBS=""],
       [AS_IF([test "X$ax_cv_check_glu_libglu" = Xyes],
-             [GLU_LIBS=$GL_LIBS],
-             [GLU_LIBS="$ax_cv_check_glu_libglu $GL_LIBS"])])
+             [GLU_LIBS=""],
+             [GLU_LIBS="$ax_cv_check_glu_libglu"])])
 AC_SUBST([GLU_CFLAGS])
 AC_SUBST([GLU_LIBS])
 

m4/ax_check_glut.m4

@@ -10,7 +10,7 @@
 # header "GLUT/glut.h" is found, HAVE_GLUT_GLUT_H is defined.  These
 # preprocessor definitions may not be mutually exclusive.
 #
-# version: 2.1
+# version: 2.2
 # author: Braden McDaniel <braden@endoframe.com>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -43,7 +43,6 @@ AC_CHECK_HEADERS([GL/glut.h GLUT/glut.h])
 CPPFLAGS=$ax_save_CPPFLAGS
 
 GLUT_CFLAGS=$GLU_CFLAGS
-GLUT_LIBS=$GLU_LIBS
 
 m4_define([AX_CHECK_GLUT_PROGRAM],
           [AC_LANG_PROGRAM([[
@@ -59,41 +58,42 @@ m4_define([AX_CHECK_GLUT_PROGRAM],
 # endif]],
                            [[glutMainLoop()]])])
 
+AC_CACHE_CHECK([for GLUT library], [ax_cv_check_glut_libglut],
+[ax_cv_check_glut_libglut=no
 #
 # If X is present, assume GLUT depends on it.
 #
-AS_IF([test X$no_x != Xyes],
-      [GLUT_LIBS="$X_PRE_LIBS -lXmu -lXi $X_EXTRA_LIBS $GLUT_LIBS"])
-
-AC_CACHE_CHECK([for GLUT library], [ax_cv_check_glut_libglut],
-[ax_cv_check_glut_libglut=no
 AC_LANG_PUSH(C)
 ax_save_CPPFLAGS=$CPPFLAGS
 CPPFLAGS="$GLUT_CFLAGS $CPPFLAGS"
+ax_save_LDFLAGS=$LDFLAGS
 ax_save_LIBS=$LIBS
 LIBS=""
+AS_IF([test X$no_x != Xyes],
+      [ax_check_glut_x_libs="$X_PRE_LIBS -lXmu -lXi $X_EXTRA_LIBS"])
 ax_check_libs="-lglut32 -lglut"
 for ax_lib in $ax_check_libs; do
   AS_IF([test X$ax_compiler_ms = Xyes],
         [ax_try_lib=`echo $ax_lib | $SED -e 's/^-l//' -e 's/$/.lib/'`],
         [ax_try_lib=$ax_lib])
-  LIBS="$ax_try_lib $GLUT_LIBS $ax_save_LIBS"
+  LIBS="$ax_try_lib $GLUT_LIBS $ax_check_glut_x_libs $ax_save_LIBS"
   AC_LINK_IFELSE([AX_CHECK_GLUT_PROGRAM],
                  [ax_cv_check_glut_libglut=$ax_try_lib; break])
 done
 
+LIBS=$ax_save_LIBS
 AS_IF([test "X$ax_cv_check_glut_libglut" = Xno -a X$no_x = Xyes],
-      [LIBS='-framework GLUT'
+      [LDFLAGS="$ax_save_LDFLAGS -framework GLUT"
       AC_LINK_IFELSE([AX_CHECK_GLUT_PROGRAM],
-                     [ax_cv_check_glut_libglut=$LIBS])])
+                     [ax_cv_check_glut_libglut='-framework GLUT'])])
 
+LDFLAGS=$ax_save_LDFLAGS
 CPPFLAGS=$ax_save_CPPFLAGS
-LIBS=$ax_save_LIBS
 AC_LANG_POP(C)])
 
 AS_IF([test "X$ax_cv_check_glut_libglut" = Xno],
       [no_glut=yes; GLUT_CFLAGS=""; GLUT_LIBS=""],
-      [GLUT_LIBS="$ax_cv_check_glut_libglut $GLUT_LIBS"])
+      [GLUT_LIBS="$ax_cv_check_glut_libglut"])
 
 AC_SUBST([GLUT_CFLAGS])
 AC_SUBST([GLUT_LIBS])