X-Git-Url: https://git.stderr.nl/gitweb?p=projects%2Fchimara%2Fchimara.git;a=blobdiff_plain;f=configure.ac;h=391b91f4e3c0b7bb6deec17b50e23fe4a09bf909;hp=25352f305e63b18e630471be6416d28afdf3cf82;hb=59f3bc1e4f21377c362c1f497fb225711127d7a0;hpb=7156064bdd1cec914bafa6376ab95532d9ee2a4b

diff --git a/configure.ac b/configure.ac
index 25352f3..391b91f 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,12 +44,8 @@ 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
@@ -76,25 +71,9 @@ GETTEXT_PACKAGE=chimara
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name])
 
-### ILIAD #####################################################################
-AC_ARG_ENABLE([iliad],
-	[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)
+### INTROSPECTION ##############################################################
+
+GOBJECT_INTROSPECTION_CHECK([0.6.7])
 
 ### RPM CONFIGURATION ##########################################################
 # --enable-rpm requires rpm and rpmbuild
@@ -119,12 +98,17 @@ 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"])
 
+### 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
@@ -132,9 +116,15 @@ 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
+])
 # 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
 ])
 
@@ -181,7 +171,7 @@ interpreters/glulxe/Makefile
 interpreters/git/Makefile
 tests/Makefile
 player/Makefile
-player/chimara.menus
+player/config.py
 docs/Makefile
 docs/reference/Makefile
 docs/reference/version.xml