From 46479584f74a7a0b6b8db21b58d32588d125e39c Mon Sep 17 00:00:00 2001 From: Philip Chimento Date: Sat, 5 Feb 2011 00:44:31 +0100 Subject: [PATCH] Reinstated 'Open Recent' menu And added a configure option, '--disable-recent' to skip it, in order to work around the GTK Quartz bug on OS X that makes the player crash. --- configure.ac | 14 ++++++++++++++ player/{chimara.menus => chimara.menus.in} | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) rename player/{chimara.menus => chimara.menus.in} (95%) diff --git a/configure.ac b/configure.ac index 3a4364c..444ad31 100644 --- a/configure.ac +++ b/configure.ac @@ -88,6 +88,19 @@ AC_ARG_ENABLE([iliad], AM_CONDITIONAL([TARGET_ILIAD], [$TEST "x$iliad" = xtrue]) +### 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])], + [AS_CASE([${enableval}], + [yes], [OPEN_RECENT_MENU_ITEM=""], + [no], [OPEN_RECENT_MENU_ITEM=""], + [AC_MSG_ERROR([bad value ${enableval} for --enable-recent])] + )], + [OPEN_RECENT_MENU_ITEM=""] +) +AC_SUBST(OPEN_RECENT_MENU_ITEM) + ### RPM CONFIGURATION ########################################################## # --enable-rpm requires rpm and rpmbuild AC_PATH_PROG([RPMBUILD], [rpmbuild], [notfound]) @@ -178,6 +191,7 @@ interpreters/glulxe/Makefile interpreters/git/Makefile tests/Makefile player/Makefile +player/chimara.menus docs/Makefile docs/reference/Makefile docs/reference/version.xml diff --git a/player/chimara.menus b/player/chimara.menus.in similarity index 95% rename from player/chimara.menus rename to player/chimara.menus.in index 7f28fd5..cb383f7 100644 --- a/player/chimara.menus +++ b/player/chimara.menus.in @@ -3,7 +3,7 @@ - + @OPEN_RECENT_MENU_ITEM@ -- 2.30.2