X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=configure.ac;h=9a3299dc826d9cb4d500fcdbc105911b882d5551;hb=ea1acbd0ed1f4ee7b7a8cd65412f6213ccf62094;hp=f83e75504f16aa6db4ad6e6ae6e5f83120ade296;hpb=a6b59671a49e2b0ec91c8a0fbbfe4804ca126f24;p=projects%2Fchimara%2Fchimara.git

diff --git a/configure.ac b/configure.ac
index f83e755..9a3299d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,7 @@ AC_SUBST(LT_VERSION_INFO)
 # Recommended Glib version: at least 2.16
 GTK_REQUIRED_VERSION=2.6
 GLIB_REQUIRED_VERSION=2.6
-GTK_DOC_REQUIRED_VERSION=1.9
+GTK_DOC_REQUIRED_VERSION=1.12
 AC_SUBST(GTK_REQUIRED_VERSION)
 AC_SUBST(GLIB_REQUIRED_VERSION)
 AC_SUBST(GTK_DOC_REQUIRED_VERSION)
@@ -85,18 +85,6 @@ AC_ARG_ENABLE([iliad],
 	[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])
@@ -118,7 +106,12 @@ 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-controller-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 #######################################################
 
@@ -133,11 +126,18 @@ 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+-2.0 >= $GTK_REQUIRED_VERSION
+	gmodule-2.0
+	libgda-4.0
+	libsoup-2.4
+])
 # Libraries needed to build test programs
 PKG_CHECK_MODULES([TEST], [
 	gtk+-2.0 >= $GTK_REQUIRED_VERSION
 	gmodule-2.0 >= $GLIB_REQUIRED_VERSION
-	libgda-4.0
 ])
 
 # GStreamer plugins needed to run library
@@ -183,7 +183,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