fix for GL_DEPS_LIBS when there is neither gl.pc nor libGL.so 18/1018/1
authorZhao Halley <halley.zhao@intel.com>
Wed, 15 Aug 2012 08:16:23 +0000 (16:16 +0800)
committerZhao Halley <halley.zhao@intel.com>
Fri, 17 Aug 2012 02:29:21 +0000 (10:29 +0800)
configure.ac

index 9c282b2..eedd6fb 100644 (file)
@@ -236,12 +236,19 @@ GL_DEPS_LIBS=""
 if test "$USE_X11:$enable_glx" = "yes:yes"; then
     saved_CFLAGS="$CFLAGS"
     saved_LIBS="$LIBS"
-    PKG_CHECK_MODULES([GL_DEPS], [gl], [], [GL_DEPS_LIBS="-lX11 -lGL"])
+    PKG_CHECK_MODULES([GL_DEPS], [gl], [], [_GL_DEPS_LIBS="-lX11 -lGL"])
     CFLAGS="$CFLAGS $GL_DEPS_CFLAGS"
-    LIBS="$LIBS $GL_DEPS_LIBS"
+    if test -nz "$GL_DEPS_LIBS" ; then
+        LIBS="$LIBS $GL_DEPS_LIBS"
+    else
+        LIBS="$LIBS $_GL_DEPS_LIBS"
+    fi
     AC_CHECK_HEADERS([GL/gl.h])
     AC_CHECK_HEADERS([GL/glx.h])
     AC_CHECK_LIB(GL, glXCreateContext, [USE_GLX="yes"])
+    if test "$USE_GLX" = "yes" && test -z "$GL_DEPS_LIBS"; then
+        GL_DEPS_LIBS = "$_GL_DEPS_LIBS="
+    fi
     CFLAGS="$saved_CFLAGS"
     LIBS="$saved_LIBS"
 fi