From 782e9d1ade2c4b6c0ecfd296adda547d7dff2962 Mon Sep 17 00:00:00 2001 From: "Peter W. Draper" Date: Thu, 31 Oct 2013 12:43:26 +0000 Subject: [PATCH] mesa: more fixes to opengl tests --- thirdparty/mesa3d/mesa/configure.ac | 4 ++-- thirdparty/mesa3d/mesa/mdl_have_opengl.m4 | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/thirdparty/mesa3d/mesa/configure.ac b/thirdparty/mesa3d/mesa/configure.ac index 6678f1fd381..5b3b00d5861 100644 --- 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 index f2db4348c2f..ce0eb5d4fbc 100644 --- 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