[aisleriot] build: Require guile 2.0

[Christian Persch <chpe src gnome org>]

commit 445443c9162c614934ae8cf5abc50c5daa2c8bce
Author: Christian Persch <chpe gnome org>
Date:   Mon Dec 19 19:27:28 2011 +0100

    build: Require guile 2.0

 configure.ac      |   14 ++++++--------
 games/Makefile.am |   12 ------------
 src/game.c        |   11 -----------
 3 files changed, 6 insertions(+), 31 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d72a328..27b76bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -488,7 +488,6 @@ IT_PROG_INTLTOOL([0.35.0])
 # Guile
 # *****
 
-GUILE_1_8_REQUIRED=1.8.0
 GUILE_2_0_REQUIRED=2.0.0
 GUILE_2_2_REQUIRED=2.0.0
 
@@ -496,16 +495,17 @@ GUILE_PKGS=
 
 AC_MSG_CHECKING([which guile version to use])
 AC_ARG_WITH([guile],
-  [AS_HELP_STRING([--with-guile=1.8|2.0|2.2|auto],[Which guile version to use (default: 1.8)])],
+  [AS_HELP_STRING([--with-guile=2.0|2.2|auto],[Which guile version to use (default: 2.0)])],
   [case "$with_guile" in
-     1.8|2.0|2.2|auto) ;;
-     *) AC_MSG_ERROR([unknown or unsupported guile version $with_guile specified]) ;;
+     1.8) AC_MSG_ERROR([unsupported guile version $with_guile requested]) ;;
+     2.0|2.2|auto) ;;
+     *) AC_MSG_ERROR([unsupported guile version $with_guile requested]) ;;
     esac],
-   [with_guile=1.8])
+   [with_guile=2.0])
 
 if test "$with_guile" = "auto"; then
   with_guile=
-  for version in 2.2 2.0 1.8; do
+  for version in 2.2 2.0; do
     GUILE_REQUIRED=AS_TR_SH([GUILE_${version}_REQUIRED])
     GUILE_PKGS="guile-$version >= ${!GUILE_REQUIRED}"
     if $PKG_CONFIG --exists $GUILE_PKGS; then
@@ -529,8 +529,6 @@ AC_MSG_RESULT([$with_guile_result])
 
 PKG_CHECK_MODULES([GUILE],[$GUILE_PKGS])
 
-AM_CONDITIONAL([HAVE_GUILE_2_X],[test "$with_guile" != "1.8"])
-
 AC_SUBST([GUILE_EFFECTIVE_VERSION],[$with_guile])
 
 AC_ARG_VAR([GUILE],[the guile programme])
diff --git a/games/Makefile.am b/games/Makefile.am
index 5bf39f0..4bba3ed 100644
--- a/games/Makefile.am
+++ b/games/Makefile.am
@@ -95,8 +95,6 @@ games_GUILE = \
 	zebra.scm \
 	$(NULL)
 
-if HAVE_GUILE_2_X
-
 pkglibguiledir = $(pkglibdir)/guile/$(GUILE_EFFECTIVE_VERSION)
 compiledmoduledir = $(pkglibguiledir)/aisleriot
 
@@ -115,16 +113,6 @@ GUILE_FLAGS =
 %.go: %.scm
 	$(AM_V_GUILEC) GUILE=$(GUILE) GUILE_FLAGS=$(GUILE_FLAGS) GUILE_AUTO_COMPILE=0 GUILE_LOAD_PATH=.:$(srcdir) GUILE_LOAD_COMPILED_PATH=. $(srcdir)/guile-compile compile $(GUILE_WARNINGS) -o "$@" "$<"
 
-else # !HAVE_GUILE_2_X
-
-pkgdataguiledir = $(pkgdatadir)/guile/$(GUILE_EFFECTIVE_VERSION)
-moduledir = $(pkgdataguiledir)/aisleriot
-
-nodist_pkgdataguile_DATA = $(games_GUILE)
-nodist_module_DATA = $(module_GUILE)
-
-endif # HAVE_GUILE_2_X
-
 EXTRA_DIST = \
 	$(games_GUILE) \
 	$(module_GUILE) \
diff --git a/src/game.c b/src/game.c
index e568f2d..4cb9c17 100644
--- a/src/game.c
+++ b/src/game.c
@@ -44,13 +44,6 @@
 
 #define I_(string) g_intern_static_string (string)
 
-#ifndef SCM_MAJOR_VERSION
-#define SCM_MAJOR_VERSION 1
-#endif
-#ifndef SCM_EFFECTIVE_VERSION
-#define SCM_EFFECTIVE_VERSION "1.8"
-#endif
-
 struct _AisleriotGameClass
 {
   GObjectClass parent_class;
@@ -1396,7 +1389,6 @@ aisleriot_game_class_init (AisleriotGameClass *klass)
                                                           scm_list_1 (scm_from_locale_string (path)))));
   g_free (path);
 
-#if SCM_MAJOR_VERSION >= 2
   path = g_build_filename (ar_runtime_get_directory (AR_RUNTIME_PKG_LIBRARY_DIRECTORY),
                            "guile",
                            SCM_EFFECTIVE_VERSION,
@@ -1405,7 +1397,6 @@ aisleriot_game_class_init (AisleriotGameClass *klass)
   scm_variable_set_x (variable, scm_append_x (scm_list_2 (scm_variable_ref (variable),
                                                           scm_list_1 (scm_from_locale_string (path)))));
   g_free (path);
-#endif
 }
 
 /* public API */
@@ -2664,14 +2655,12 @@ ar_get_game_modules (void)
 
   hash_table = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
 
-#if SCM_MAJOR_VERSION >= 2
   path = g_build_filename (ar_runtime_get_directory (AR_RUNTIME_PKG_LIBRARY_DIRECTORY),
                            "guile",
                            SCM_EFFECTIVE_VERSION,
                            NULL);
   append_games_from_path (hash_table, path, ".go");
   g_free (path);
-#endif
 
   path = g_build_filename (ar_runtime_get_directory (AR_RUNTIME_PKG_DATA_DIRECTORY),
                            "guile",