From bd8ede1bac1ddfe0563c047d231b66c1457c7e02 Mon Sep 17 00:00:00 2001 From: Lionel Ulmer Date: Thu, 12 Oct 2000 20:45:58 +0000 Subject: [PATCH] Fixed the OpenGL detection code. --- configure | 8 ++++---- configure.in | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/configure b/configure index eec1f2ba055..2cff43cf071 100755 --- a/configure +++ b/configure @@ -3799,15 +3799,15 @@ else fi + if test $ac_cv_lib_GL_glXCreateContext = "yes" + then - OPENGLFILES='$(OPENGLFILES)' - cat >> confdefs.h <<\EOF + OPENGLFILES='$(OPENGLFILES)' + cat >> confdefs.h <<\EOF #define HAVE_OPENGL 1 EOF - if test $ac_cv_lib_GL_glXCreateContext = "yes" - then echo $ac_n "checking for glXGetProcAddressARB in -lGL""... $ac_c" 1>&6 echo "configure:3813: checking for glXGetProcAddressARB in -lGL" >&5 ac_lib_var=`echo GL'_'glXGetProcAddressARB | sed 'y%./+-%__p_%'` diff --git a/configure.in b/configure.in index b1c70a91fd3..2db3876148a 100644 --- a/configure.in +++ b/configure.in @@ -280,12 +280,12 @@ then ,, $X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS) - - OPENGLFILES='$(OPENGLFILES)' - AC_DEFINE(HAVE_OPENGL) - if test $ac_cv_lib_GL_glXCreateContext = "yes" then + + OPENGLFILES='$(OPENGLFILES)' + AC_DEFINE(HAVE_OPENGL) + AC_CHECK_LIB(GL,glXGetProcAddressARB,AC_DEFINE(HAVE_GLX_GETPROCADDRESS),,$X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS) if test $ac_cv_lib_GL_glXGetProcAddressARB = "yes"