From 6dca38e9d50fdc312fb30bee6765f4d15e67b930 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Mon, 11 Jan 2010 01:40:42 +0000
Subject: [PATCH] Detect OpenGL in new /usr/lib/mesa directory

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kde-common@1072815 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 admin/acinclude.m4.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin/acinclude.m4.in b/admin/acinclude.m4.in
index c37d92b..29f506c 100644
--- a/admin/acinclude.m4.in
+++ b/admin/acinclude.m4.in
@@ -4054,7 +4054,7 @@ AC_DEFUN([AC_HAVE_GL],
     ac_save_cxxflags=$CXXFLAGS
     ac_save_libs=$LIBS
     LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries"
-    LIBS="$LIBS -lGL -lGLU"
+    LIBS="$LIBS -L/usr/lib/mesa -lGL -lGLU"
     test "x$kde_use_qt_mac" != xyes && test "x$kde_use_qt_emb" != xyes && LIBS="$LIBS -lX11"
     LIBS="$LIBS $LIB_XEXT -lm $LIBSOCKET"
     CXXFLAGS="$CFLAGS $X_INCLUDES"
@@ -4077,9 +4077,9 @@ AC_DEFUN([AC_HAVE_GL],
   else
     AC_DEFINE(HAVE_GL, 1, [Defines if you have GL (Mesa, OpenGL, ...)])
     if test "$GL_LDFLAGS" = ""; then
-       GLLIB='-lGLU -lGL $(LIB_X11)'
+       GLLIB='-L/usr/lib/mesa -lGLU -lGL $(LIB_X11)'
     else
-       GLLIB="$GL_LDFLAGS -lGLU -lGL "'$(LIB_X11)'
+       GLLIB="$GL_LDFLAGS -L/usr/lib/mesa -lGLU -lGL "'$(LIB_X11)'
     fi
     if test "$GL_INCLUDE" = ""; then
        GLINC=""