From: Philip Chimento Date: Fri, 4 Feb 2011 23:44:31 +0000 (+0100) Subject: Reinstated 'Open Recent' menu X-Git-Tag: v0.9~144 X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=46479584f74a7a0b6b8db21b58d32588d125e39c;p=projects%2Fchimara%2Fchimara.git 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. --- 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 deleted file mode 100644 index 7f28fd5..0000000 --- a/player/chimara.menus +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/player/chimara.menus.in b/player/chimara.menus.in new file mode 100644 index 0000000..cb383f7 --- /dev/null +++ b/player/chimara.menus.in @@ -0,0 +1,37 @@ + + + + + + @OPEN_RECENT_MENU_ITEM@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +