X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=configure.ac;h=25352f305e63b18e630471be6416d28afdf3cf82;hb=e3b92c018add5953f6055efe5b3fc4eafab46b0f;hp=18e630a32b9f5662bbed6a78493f6a01405047dc;hpb=dfc0e872bf76faa4944a11d0905eca43143182e2;p=projects%2Fchimara%2Fchimara.git

diff --git a/configure.ac b/configure.ac
index 18e630a..25352f3 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,6 +25,8 @@ LT_VERSION_INFO="$CHIMARA_CURRENT:$CHIMARA_REVISION:$CHIMARA_AGE"
 AC_SUBST(LT_VERSION_INFO)
 
 ### REQUIREMENTS ##############################################################
+# 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
@@ -53,6 +55,7 @@ AM_GNU_GETTEXT([external])   # Gettext, link to system libintl
 IT_PROG_INTLTOOL([0.40.0])   # Intltool
 PKG_PROG_PKG_CONFIG          # pkg_config
 GTK_DOC_CHECK($GTK_DOC_REQUIRED_VERSION) 
+GLIB_GSETTINGS               # GSettings
 # Other utilities used in this package's various make scripts
 AC_PROG_AWK
 AC_PATH_PROG([PERL], [perl]) # Perl
@@ -75,33 +78,46 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name])
 
 ### ILIAD #####################################################################
 AC_ARG_ENABLE([iliad],
-  [AS_HELP_STRING([--enable-iliad],[Compiles Chimara for the iLiad])],
-  [AS_CASE([${enableval}],
-	   [yes], [iliad=true],
-	   [no], [iliad=false],
-	   [AC_MSG_ERROR([bad value ${enableval} for --enable-iliad])]
-   )],
-   [iliad=false]
-)
-
-AM_CONDITIONAL([TARGET_ILIAD], [$TEST "x$iliad" = xtrue])
+	[AS_HELP_STRING([--enable-iliad=@<:@yes/no@:>@],
+		[Compiles Chimara for the iLiad @<:@default=no@:>@])],
+	[],
+	[enable_iliad=no])
+AM_CONDITIONAL(TARGET_ILIAD, $TEST "x$enable_iliad" = xyes)
+
+### 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])],
+	[],
+	[enable_recent=yes])
+AS_IF([$TEST "x$enable_recent" = "xyes"],
+	[OPEN_RECENT_MENU_ITEM="<menuitem action=\"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])
 AC_ARG_ENABLE([rpm],
-	[AS_HELP_STRING([--enable-rpm],[Configure for building RPM package [no] (requires rpm and rpmbuild)])],
-	[AS_CASE([${enableval}],
-		[yes], [AS_IF(
-			[$TEST "x$RPMBUILD" = xnotfound],
-				[AC_MSG_ERROR([rpmbuild is required for --enable-rpm])],
-			[rpm=true])],
-		[no],  [rpm=false],
-		[AC_MSG_ERROR([bad value ${enableval} for --enable-rpm])]
-	)],
-	[rpm=false]
-)
-AM_CONDITIONAL([BUILDING_RPM], [$TEST "x$rpm" = xtrue])
+	[AS_HELP_STRING([--enable-rpm=@<:@yes/no@:>@],
+		[Configure for building RPM package @<:@default=no@:>@ (requires rpm and rpmbuild)])],
+	[AS_IF([$TEST "x$enable_rpm" = xyes],
+		[AS_IF([$TEST "x$RPMBUILD" = xnotfound],
+			[AC_MSG_ERROR([rpmbuild is required for --enable-rpm])])])],
+	[enable_rpm=no])
+AM_CONDITIONAL(BUILDING_RPM, $TEST "x$enable_rpm" = xyes)
+
+### 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 #######################################################
 
@@ -112,6 +128,7 @@ PKG_CHECK_MODULES([CHIMARA], [
 	gthread-2.0 
 	gmodule-2.0
 	pango
+	$SOUND_MODULE
 ])
 CHIMARA_LIBS="$CHIMARA_LIBS -lm"
 AC_SUBST(CHIMARA_LIBS)
@@ -121,6 +138,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.
@@ -145,6 +181,7 @@ interpreters/glulxe/Makefile
 interpreters/git/Makefile
 tests/Makefile
 player/Makefile
+player/chimara.menus
 docs/Makefile
 docs/reference/Makefile
 docs/reference/version.xml