X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=configure.ac;h=444ad3181eee9a2e6aa99bc1b14c2881e5684534;hb=f5ef90183114ba9429109038b0a9be7f3f90b900;hp=787fef9f241a6d42f000f057182ea7383fe3ece8;hpb=71bb42dc75907bd2acf2706ecec69acf57177221;p=projects%2Fchimara%2Fchimara.git

diff --git a/configure.ac b/configure.ac
index 787fef9..444ad31 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
@@ -86,6 +88,19 @@ AC_ARG_ENABLE([iliad],
 
 AM_CONDITIONAL([TARGET_ILIAD], [$TEST "x$iliad" = xtrue])
 
+### BUILD WITHOUT RECENT FILES MANAGER #########################################
+# (to work around a bug on OS X)
+AC_ARG_ENABLE([recent],
+	[AS_HELP_STRING([--disable-recent],[Omit recent files menu (to work around a bug on OS X])],
+	[AS_CASE([${enableval}],
+		[yes], [OPEN_RECENT_MENU_ITEM="<menuitem action=\"recent\"/>"],
+		[no], [OPEN_RECENT_MENU_ITEM="<!--  <menuitem action=\"recent\"/>-->"],
+		[AC_MSG_ERROR([bad value ${enableval} for --enable-recent])]
+	)],
+	[OPEN_RECENT_MENU_ITEM="<menuitem action=\"recent\"/>"]
+)
+AC_SUBST(OPEN_RECENT_MENU_ITEM)
+
 ### RPM CONFIGURATION ##########################################################
 # --enable-rpm requires rpm and rpmbuild
 AC_PATH_PROG([RPMBUILD], [rpmbuild], [notfound])
@@ -102,9 +117,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 >= 0.10.12"])
 
 ### CHECK FOR LIBRARIES #######################################################
 
@@ -115,6 +138,7 @@ PKG_CHECK_MODULES([CHIMARA], [
 	gthread-2.0 
 	gmodule-2.0
 	pango
+	$SOUND_MODULE
 ])
 CHIMARA_LIBS="$CHIMARA_LIBS -lm"
 AC_SUBST(CHIMARA_LIBS)
@@ -124,6 +148,25 @@ PKG_CHECK_MODULES([TEST], [
 	gmodule-2.0 >= $GLIB_REQUIRED_VERSION
 ])
 
+# GStreamer plugins needed to run library
+AS_IF([$TEST "x$with_gstreamer" != xno], [
+	m4_defun([AX_GST_REQUIRE_ELEMENT],
+		[AM_GST_ELEMENT_CHECK([$1],
+			[],
+			[AC_MSG_ERROR([GStreamer element $1 not found. You need to install gstreamer-plugins-m4_default([$2], [base]).])]
+		)]
+	)
+	AX_GST_REQUIRE_ELEMENT([giostreamsrc])
+	AX_GST_REQUIRE_ELEMENT([typefind])
+	AX_GST_REQUIRE_ELEMENT([audioconvert])
+	AX_GST_REQUIRE_ELEMENT([volume])
+	AX_GST_REQUIRE_ELEMENT([oggdemux])
+	AX_GST_REQUIRE_ELEMENT([vorbisdec])
+	AX_GST_REQUIRE_ELEMENT([autoaudiosink], [good])
+	AX_GST_REQUIRE_ELEMENT([aiffparse], [bad])
+	AX_GST_REQUIRE_ELEMENT([modplug], [bad])
+])
+
 # Plugin flags; include '-module' in each Makefile.am, because AC_SUBSTed
 # variables are black boxes to Automake, so it has to know about it being a
 # module in the makefile itself.
@@ -148,6 +191,7 @@ interpreters/glulxe/Makefile
 interpreters/git/Makefile
 tests/Makefile
 player/Makefile
+player/chimara.menus
 docs/Makefile
 docs/reference/Makefile
 docs/reference/version.xml