From: Derek Foreman <foremande@gmail.com>
Date: Tue, 22 Jun 2010 18:35:18 +0000 (-0400)
Subject: Add libglew to the build
X-Git-Tag: cgl~28
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=b4c5c53d33dcb9cfb81832251621ba989f595a40;p=dana%2Fopenbox.git

Add libglew to the build
---

diff --git a/Makefile.am b/Makefile.am
index 0d0a4269..a720c9ea 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -162,6 +162,7 @@ obt_libobt_la_CPPFLAGS = \
 	$(XRENDER_CFLAGS) \
 	$(XDAMAGE_CFLAGS) \
 	$(XCOMPOSITE_CFLAGS) \
+        $(GLEW_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(XML_CFLAGS) \
 	-DG_LOG_DOMAIN=\"Obt\" \
@@ -179,6 +180,7 @@ obt_libobt_la_LIBADD = \
 	$(XRENDER_LIBS) \
 	$(XDAMAGE_LIBS) \
 	$(XCOMPOSITE_LIBS) \
+        $(GLEW_LIBS) \
 	$(GLIB_LIBS) \
 	$(XML_LIBS)
 obt_libobt_la_SOURCES = \
@@ -215,6 +217,7 @@ openbox_openbox_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(LIBSN_CFLAGS) \
 	$(XCOMPOSITE_CFLAGS) \
+        $(GLEW_CFLAGS) \
 	$(XML_CFLAGS) \
 	-DLOCALEDIR=\"$(localedir)\" \
 	-DDATADIR=\"$(datadir)\" \
@@ -227,6 +230,7 @@ openbox_openbox_LDADD = \
 	$(XCURSOR_LIBS) \
 	$(LIBSN_LIBS) \
 	$(XCOMPOSITE_LIBS) \
+        $(GLEW_LIBS) \
 	$(XML_LIBS) \
 	$(EFENCE_LIBS) \
 	$(LIBINTL) \
diff --git a/configure.ac b/configure.ac
index da37f2c8..04f3caf0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -246,6 +246,10 @@ if test "$enable_compositing" = yes; then
   AC_SUBST(XDAMAGE_CFLAGS)
   AC_SUBST(XDAMAGE_LIBS)
 
+  PKG_CHECK_MODULES(GLEW, [glew])
+  AC_SUBST(GLEW_CFLAGS)
+  AC_SUBST(GLEW_LIBS)
+
   AC_MSG_CHECKING(for GL_CFLAGS)
   AC_ARG_WITH(gl-cflags, [  --with-gl-cflags=CFLAGS ],
                          [GL_CFLAGS="$withval"],