mesa: more fixes to opengl tests

Starlink · Feb 26, 2014 · 782e9d1 · 782e9d1
1 parent e416992
commit 782e9d1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/thirdparty/mesa3d/mesa/configure.ac b/thirdparty/mesa3d/mesa/configure.ac
@@ -1,10 +1,10 @@
 dnl    Process this file with autoconf to produce a configure script
 AC_REVISION($Revision: 16442 $)
 
-AC_INIT(mesa, 7.0.1, starlink@jiscmail.ac.uk)
+AC_INIT([mesa],[7.0.1],[starlink@jiscmail.ac.uk])
 
 dnl    Require autoconf-2.50 at least
-AC_PREREQ(2.50)
+AC_PREREQ([2.68])
 dnl    Require Starlink automake
 AM_INIT_AUTOMAKE(1.8.2-starlink)
 

diff --git a/thirdparty/mesa3d/mesa/mdl_have_opengl.m4 b/thirdparty/mesa3d/mesa/mdl_have_opengl.m4
@@ -159,9 +159,8 @@ dnl bugfix: dont forget to cache this variables, too
 
 dnl Do this outside of the cache check. That cannot have side-effects in case
 dnl the cache check succeeds and the code is not ran.
-  if test "$mdl_cv_have_OpenGL" = "yes"; then
-      AC_SUBST(GL_CFLAGS)
-      AC_SUBST(GL_LIBS)
-  fi
+  AC_SUBST([GL_CFLAGS])
+  AC_SUBST([GL_LIBS])
+
 ])
 dnl endof bugfix -ainan