Add libglew to the build
authorDerek Foreman <foremande@gmail.com>
Tue, 22 Jun 2010 18:35:18 +0000 (14:35 -0400)
committerDana Jansens <danakj@orodu.net>
Sat, 26 Jun 2010 23:30:50 +0000 (01:30 +0200)
Makefile.am
configure.ac

index 0d0a42699da27ff054ab40fad7ea57b877e8b952..a720c9ea2fa423896a66ace76178a8b81036e194 100644 (file)
@@ -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) \
index da37f2c8a628343f9a4d12330334e746bad113f9..04f3caf0cb1a5586f324e855e126b0115fec633f 100644 (file)
@@ -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"],