X-Git-Url: https://git.stderr.nl/gitweb?p=projects%2Fchimara%2Fchimara.git;a=blobdiff_plain;f=configure.ac;h=6299c4d11d34c4e7b0e2fd12afd5414849ed32a5;hp=7ddf9f0b78267a56f0d894ab1235dd705ed97b1b;hb=cdb84c7c776f214f41ba1a509efb2494e7ed1baf;hpb=88f7453ab167aa1a61cc3e53c6647c6c3b3318bd

diff --git a/configure.ac b/configure.ac
index 7ddf9f0..6299c4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,16 +2,17 @@
 
 ### INITIALIZATION ############################################################
 
-# Initialize Autoconf 
+AC_PREREQ([2.62]) # Oldest version of Autoconf that works with introspection
+# Initialize Autoconf
 # Args: (human-readable package name, package version, bug report address, 
 # tarballname)
 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
-AC_CONFIG_MACRO_DIR(m4)
+AC_CONFIG_MACRO_DIR([m4])
 # Initialize Automake
-AM_INIT_AUTOMAKE([-Wall])
+AM_INIT_AUTOMAKE([-Wall -Wno-portability])
 # Configure with --enable-silent-rules to cut down on clutter
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
@@ -25,11 +26,9 @@ 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
+GTK_REQUIRED_VERSION=3.2
+GLIB_REQUIRED_VERSION=2.16
+GTK_DOC_REQUIRED_VERSION=1.12
 AC_SUBST(GTK_REQUIRED_VERSION)
 AC_SUBST(GLIB_REQUIRED_VERSION)
 AC_SUBST(GTK_DOC_REQUIRED_VERSION)
@@ -45,16 +44,13 @@ AC_PROG_YACC                 # Building nitfol requires yacc
 ### DECLARE PROGRAMS ##########################################################
 
 AC_PROG_INSTALL              # Install
-m4_defun([_LT_AC_LANG_CXX_CONFIG], [:]) # Disable unnecessary Libtool checks
-m4_defun([_LT_AC_LANG_F77_CONFIG], [:]) # to save time (1.5 only)
-LT_INIT                      # Libtool 2.2.6 and up
-#LT_INIT([dlopen])           # Should call it this way, but
-#LT_PREREQ([2.2.6])          # ...goddamn Debian still has 1.5
-AC_PROG_LIBTOOL              # Old way of declaring Libtool
+LT_INIT([dlopen])            # Libtool 2.2.6 and up
+LT_PREREQ([2.2.6])
 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,35 +71,29 @@ GETTEXT_PACKAGE=chimara
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name])
 
+### INTROSPECTION ##############################################################
+
+GOBJECT_INTROSPECTION_CHECK([0.6.7])
+
 ### 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)
 
 ### 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 ######################################################
 
@@ -114,14 +104,19 @@ AC_ARG_WITH([gstreamer],
 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 gstreamer-plugins-base-0.10"])
+	SOUND_MODULE="gstreamer-0.10 >= 0.10.12"])
+
+### WHETHER TO GENERATE A .VAPI FILE ##########################################
+# Requires vapigen
+AC_PATH_PROG([VAPIGEN], [vapigen], [notfound])
+AM_CONDITIONAL(BUILDING_VAPI, $TEST "x$VAPIGEN" != xnotfound)
 
 ### CHECK FOR LIBRARIES #######################################################
 
 # Libraries needed to build Chimara library
 PKG_CHECK_MODULES([CHIMARA], [
 	glib-2.0 >= $GLIB_REQUIRED_VERSION
-	gtk+-2.0 >= $GTK_REQUIRED_VERSION
+	gtk+-3.0 >= $GTK_REQUIRED_VERSION
 	gthread-2.0 
 	gmodule-2.0
 	pango
@@ -129,12 +124,39 @@ PKG_CHECK_MODULES([CHIMARA], [
 ])
 CHIMARA_LIBS="$CHIMARA_LIBS -lm"
 AC_SUBST(CHIMARA_LIBS)
+# Libraries needed to build Chimara player
+PKG_CHECK_MODULES([PLAYER], [
+	glib-2.0 >= $GLIB_REQUIRED_VERSION
+	gtk+-3.0 >= $GTK_REQUIRED_VERSION
+	gmodule-2.0
+	dnl libgda-4.0
+	libsoup-2.4
+])
 # Libraries needed to build test programs
 PKG_CHECK_MODULES([TEST], [
-	gtk+-2.0 >= $GTK_REQUIRED_VERSION
+	gtk+-3.0 >= $GTK_REQUIRED_VERSION
 	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.
@@ -159,11 +181,13 @@ interpreters/glulxe/Makefile
 interpreters/git/Makefile
 tests/Makefile
 player/Makefile
+player/config.py
 docs/Makefile
 docs/reference/Makefile
 docs/reference/version.xml
 docs/reference/build-selector-table.pl
 po/Makefile.in
+babel/Makefile
 ])
 
 # Do it