Fixed the OpenGL detection code.

This commit is contained in:
Lionel Ulmer 2000-10-12 20:45:58 +00:00 committed by Alexandre Julliard
parent cc5365836a
commit bd8ede1bac
2 changed files with 8 additions and 8 deletions

8
configure vendored
View File

@ -3799,15 +3799,15 @@ else
fi fi
if test $ac_cv_lib_GL_glXCreateContext = "yes"
then
OPENGLFILES='$(OPENGLFILES)' OPENGLFILES='$(OPENGLFILES)'
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
#define HAVE_OPENGL 1 #define HAVE_OPENGL 1
EOF EOF
if test $ac_cv_lib_GL_glXCreateContext = "yes"
then
echo $ac_n "checking for glXGetProcAddressARB in -lGL""... $ac_c" 1>&6 echo $ac_n "checking for glXGetProcAddressARB in -lGL""... $ac_c" 1>&6
echo "configure:3813: checking for glXGetProcAddressARB in -lGL" >&5 echo "configure:3813: checking for glXGetProcAddressARB in -lGL" >&5
ac_lib_var=`echo GL'_'glXGetProcAddressARB | sed 'y%./+-%__p_%'` ac_lib_var=`echo GL'_'glXGetProcAddressARB | sed 'y%./+-%__p_%'`

View File

@ -280,12 +280,12 @@ then
,, ,,
$X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS) $X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS)
OPENGLFILES='$(OPENGLFILES)'
AC_DEFINE(HAVE_OPENGL)
if test $ac_cv_lib_GL_glXCreateContext = "yes" if test $ac_cv_lib_GL_glXCreateContext = "yes"
then 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) 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" if test $ac_cv_lib_GL_glXGetProcAddressARB = "yes"