changeset 2400:a0746d858e31

Depend on gtkglext for projectm-1.0 instead of SDL.
author William Pitcock <nenolod@atheme.org>
date Sun, 17 Feb 2008 22:58:22 -0600
parents dd2c14a4c9f1
children c96c81938c4b
files configure.ac extra.mk.in
diffstat 2 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Sat Feb 16 01:41:14 2008 +0100
+++ b/configure.ac	Sun Feb 17 22:58:22 2008 -0600
@@ -1443,10 +1443,7 @@
 
 if test "$have_projectm1" = "yes"; then
 	PKG_CHECK_MODULES(LIBPROJECTM1, libprojectM >= 1.0, [have_projectm1="yes"], [have_projectm1="no"])
-	AM_PATH_SDL(1.2.5, , [
-		AC_MSG_WARN([*** SDL is not installed. projectM will not be built. ***])
-		have_projectm1="no"
-	])
+	PKG_CHECK_MODULES(GTKGLEXT, [gtkglext-1.0 >= 1.2.0], [have_projectm1="yes"], [have_projectm1="no"]
 	if test x$libprjM = xno; then
 	        AC_MSG_WARN([*** libprojectM not found.
 	                        libprojectM is needed to build this package.
@@ -1459,6 +1456,8 @@
 fi
 AC_SUBST(LIBPROJECTM1_LIBS)
 AC_SUBST(LIBPROJECTM1_CFLAGS)
+AC_SUBST(GTKGLEXT_LIBS)
+AC_SUBST(GTKGLEXT_CFLAGS)
 
 if test "$have_projectm1" = "yes"; then
 	VISUALIZATION_PLUGINS="$VISUALIZATION_PLUGINS projectm-1.0"
--- a/extra.mk.in	Sat Feb 16 01:41:14 2008 +0100
+++ b/extra.mk.in	Sun Feb 17 22:58:22 2008 -0600
@@ -380,3 +380,5 @@
 MOWGLI_LIBS ?= @MOWGLI_LIBS@
 pluginlibdir = @plugindir@
 plugindir = ${pluginlibdir}
+GTKGLEXT_CFLAGS ?= @GTKGLEXT_CFLAGS@
+GTKGLEXT_LIBS ?= @GTKGLEXT_LIBS@