X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=configure.ac;h=646c9097c0f5659f03c576189c17f9b7f97b96bc;hb=ca7d2c46ded9c992b652a490532c6334b7eed207;hp=5b2501dcf6c836b4ad4be920a62142d4590e6457;hpb=8c695bf906638c208df1e0424fa10c0f993c2c1e;p=projects%2Fchimara%2Fchimara.git

diff --git a/configure.ac b/configure.ac
index 5b2501d..646c909 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@
 # Initialize Autoconf 
 # Args: (human-readable package name, package version, bug report address, 
 # tarballname)
-AC_INIT([chimara], [0.1])
+AC_INIT([chimara], [0.9])
 # Sanity check to make sure we are running Autoconf from the right directory
 AC_CONFIG_SRCDIR(libchimara/chimara-glk.c)
 # Put m4 macros in their own directory
@@ -25,8 +25,10 @@ LT_VERSION_INFO="$CHIMARA_CURRENT:$CHIMARA_REVISION:$CHIMARA_AGE"
 AC_SUBST(LT_VERSION_INFO)
 
 ### REQUIREMENTS ##############################################################
-GTK_REQUIRED_VERSION=2.12
-GLIB_REQUIRED_VERSION=2.16
+# Recommended GTK version: at least 2.12
+# Recommended Glib version: at least 2.16
+GTK_REQUIRED_VERSION=2.6
+GLIB_REQUIRED_VERSION=2.6
 GTK_DOC_REQUIRED_VERSION=1.9
 AC_SUBST(GTK_REQUIRED_VERSION)
 AC_SUBST(GLIB_REQUIRED_VERSION)
@@ -50,7 +52,7 @@ LT_INIT                      # Libtool 2.2.6 and up
 #LT_PREREQ([2.2.6])          # ...goddamn Debian still has 1.5
 AC_PROG_LIBTOOL              # Old way of declaring Libtool
 AM_GNU_GETTEXT([external])   # Gettext, link to system libintl
-IT_PROG_INTLTOOL    # Intltool
+IT_PROG_INTLTOOL([0.40.0])   # Intltool
 PKG_PROG_PKG_CONFIG          # pkg_config
 GTK_DOC_CHECK($GTK_DOC_REQUIRED_VERSION) 
 # Other utilities used in this package's various make scripts
@@ -102,9 +104,17 @@ AC_ARG_ENABLE([rpm],
 	[rpm=false]
 )
 AM_CONDITIONAL([BUILDING_RPM], [$TEST "x$rpm" = xtrue])
-# The user can specify the RPM release number in the environment (e.g. '1')
-AC_ARG_VAR([RPM_RELEASE], [Release number to build RPMs with [1]])
-AS_IF([$TEST "x$RPM_RELEASE" = x], [RPM_RELEASE=1])
+
+### SOUND LIBRARY TO USE ######################################################
+
+AC_ARG_WITH([gstreamer],
+	[AS_HELP_STRING([--without-gstreamer], [Disable GStreamer sound])],
+	[],
+	[with_gstreamer=yes])
+SOUND_MODULE=
+AS_IF([$TEST "x$with_gstreamer" != xno], 
+	[AC_DEFINE([GSTREAMER_SOUND], [1], [Define to enable sound support with GStreamer])
+	SOUND_MODULE=gstreamer-0.10])
 
 ### CHECK FOR LIBRARIES #######################################################
 
@@ -115,6 +125,7 @@ PKG_CHECK_MODULES([CHIMARA], [
 	gthread-2.0 
 	gmodule-2.0
 	pango
+	$SOUND_MODULE
 ])
 CHIMARA_LIBS="$CHIMARA_LIBS -lm"
 AC_SUBST(CHIMARA_LIBS)
@@ -147,6 +158,7 @@ interpreters/nitfol/Makefile
 interpreters/glulxe/Makefile
 interpreters/git/Makefile
 tests/Makefile
+player/Makefile
 docs/Makefile
 docs/reference/Makefile
 docs/reference/version.xml