From: Dana Jansens <danakj@orodu.net>
Date: Fri, 13 Jul 2007 14:35:38 +0000 (-0400)
Subject: check for libGL in order to build with composite support
X-Git-Tag: composite~1
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=5437c8efa82e96de5230cbed24a6b62acb5d83b9;p=dana%2Fopenbox.git

check for libGL in order to build with composite support
---

diff --git a/Makefile.am b/Makefile.am
index 4798f61a..c6d34422 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -118,6 +118,7 @@ openbox_openbox_CPPFLAGS = \
 	$(XRANDR_CFLAGS) \
 	$(XSHAPE_CFLAGS) \
 	$(XSYNC_CFLAGS) \
+	$(GL_CFLAGS) \
 	$(XRENDER_CFLAGS) \
 	$(XDAMAGE_CFLAGS) \
 	$(XCOMPOSITE_CFLAGS) \
@@ -140,6 +141,7 @@ openbox_openbox_LDADD = \
 	$(XSHAPE_LIBS) \
 	$(XSYNC_LIBS) \
 	$(GLIB_LIBS) \
+	$(GL_LIBS) \
 	$(XRENDER_LIBS) \
 	$(XDAMAGE_LIBS) \
 	$(XCOMPOSITE_LIBS) \
diff --git a/configure.ac b/configure.ac
index b38993ec..8147f223 100644
--- a/configure.ac
+++ b/configure.ac
@@ -156,17 +156,33 @@ PKG_CHECK_MODULES(XRENDER, [xrender],
         AC_DEFINE(USE_XDAMAGE, [1], [Use X Damage library])
         AC_SUBST(XDAMAGE_CFLAGS)
         AC_SUBST(XDAMAGE_LIBS)
-        PKG_CHECK_MODULES(XCOMPOSITE, [xcomposite],
+
+        OLD_CFLAGS=$CFLAGS
+        CFLAGS="$CFLAGS $GL_CFLAGS"
+        AC_CHECK_LIB(
+          [GL], [glXMakeCurrent],
           [
-            AC_DEFINE(USE_XCOMPOSITE, [1], [Use X Composite library])
-            AC_SUBST(XCOMPOSITE_CFLAGS)
-            AC_SUBST(XCOMPOSITE_LIBS)
-            xcomposite_found=yes
+            GL_LIBS="-lGL"
+	    AC_SUBST(GL_CFLAGS)
+	    AC_SUBST(GL_LIBS)
+
+            PKG_CHECK_MODULES(XCOMPOSITE, [xcomposite],
+              [
+                AC_DEFINE(USE_XCOMPOSITE, [1], [Use X Composite library])
+                AC_SUBST(XCOMPOSITE_CFLAGS)
+                AC_SUBST(XCOMPOSITE_LIBS)
+                xcomposite_found=yes
+              ],
+              [
+                xcomposite_found=no
+              ]
+            )
           ],
           [
             xcomposite_found=no
           ]
         )
+        CFLAGS=$OLD_CFLAGS
       ],
       [
         xcomposite_found=no