[grits] Add glut config check
- From: Andy Spencer <andys src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [grits] Add glut config check
- Date: Mon, 29 Aug 2011 00:36:52 +0000 (UTC)
commit edde3a80620c29e81241facfb1be9cbe3f4d9d89
Author: Andy Spencer <andy753421 gmail com>
Date: Wed Aug 24 17:40:41 2011 +0000
Add glut config check
configure.ac | 5 +++++
src/plugins/Makefile.am | 2 +-
2 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f77360d..ad20745 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,6 +28,11 @@ PKG_CHECK_MODULES(CAIRO, cairo)
PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.16)
PKG_CHECK_MODULES(SOUP, libsoup-2.4 >= 2.26)
+# Check for glut for example plugin
+AC_CHECK_LIB(glut, glutSolidTeapot, GLUT_LIBS="-lglut")
+AM_CONDITIONAL(HAVE_GLUT, test "$GLUT_LIBS" != "")
+AC_SUBST(GLUT_LIBS)
+
# Test for Windows vs. Unix
case "${host}" in
*mingw32*) WIN32="yes" ;;
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 1abf428..8e6f5f6 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -14,7 +14,7 @@ map_la_SOURCES = map.c map.h
env_la_SOURCES = env.c env.h
test_la_SOURCES = test.c test.h
-if NOTWIN32
+if HAVE_GLUT
noinst_LTLIBRARIES = teapot.la
teapot_la_SOURCES = \
$(top_srcdir)/examples/plugin/teapot.c \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]