From: Marijn van Vliet <w.m.vanvliet@student.utwente.nl>
Date: Tue, 28 Aug 2012 08:57:54 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.stderr.nl/projects/chimara/chimara
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=eec3f2cefd211052c2cc19a0a3add4fbef171459;hp=-c;p=projects%2Fchimara%2Fchimara.git

Merge branch 'master' of ssh://git.stderr.nl/projects/chimara/chimara
---

eec3f2cefd211052c2cc19a0a3add4fbef171459
diff --combined configure.ac
index 749c744,9a3299d..bb97b70
--- a/configure.ac
+++ b/configure.ac
@@@ -30,7 -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 +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])
@@@ -120,6 -108,11 +108,11 @@@ 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
@@@ -138,6 -131,8 +131,6 @@@ 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], [
@@@ -188,7 -183,7 +181,7 @@@ interpreters/glulxe/Makefil
  interpreters/git/Makefile
  tests/Makefile
  player/Makefile
- player/chimara.menus
+ player/config.py
  docs/Makefile
  docs/reference/Makefile
  docs/reference/version.xml