From c46d7a298b48a60df18198d6122218b7a8e24cfe Mon Sep 17 00:00:00 2001 From: Johannes Sixt Date: Mon, 29 Oct 2007 19:16:37 +0000 Subject: [PATCH] r1037: Check for OpenGL 2.0 libraries in /usr/X11R6/lib64/libGL.so.1, On OpenSUSE, this is the location of the x86_64 version of NVidia's OpenGL libraries. --- configure.in | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/configure.in b/configure.in index ed80056b..7331a03a 100644 --- a/configure.in +++ b/configure.in @@ -416,15 +416,18 @@ AC_ARG_ENABLE(opengl, if test "x$enableval" = "xyes"; then AC_CHECK_LIB([GL], [glUseProgram], [OPENGL_LIBS="-lGL"; libGL=yes], -# On SUSE 10.1, NVidia places the OpenGL 2.0 capable library in /usr/X11R6/lib +# On SUSE/OpenSUSE, NVidia places the OpenGL 2.0 capable library in /usr/X11R6/lib # but it doesn't place a libGL.so there, so the linker won't pick it up # we have to use the explicit libGL.so.1 path. save_LIBS="$LIBS" - LIBS="/usr/X11R6/lib/libGL.so.1" - AC_MSG_CHECKING(for glUseProgram in /usr/X11R6/lib/libGL.so.1) - AC_TRY_LINK([],[extern int glUseProgram(); glUseProgram();], - [OPENGL_LIBS="/usr/X11R6/lib/libGL.so.1"; libGL=yes],[libGL=no]) - AC_MSG_RESULT([$libGL]) + for l in /usr/X11R6/lib /usr/X11R6/lib64; do + LIBS="$l/libGL.so.1" + AC_MSG_CHECKING(for glUseProgram in $l/libGL.so.1) + AC_TRY_LINK([],[extern int glUseProgram(); glUseProgram();], + [OPENGL_LIBS="$l/libGL.so.1"; libGL=yes],[libGL=no]) + AC_MSG_RESULT([$libGL]) + test $libGL = yes && break + done LIBS="$save_LIBS" ) fi -- 2.11.4.GIT