From 8aa65585793f760fe4d950193a3ce4eefb007bbe Mon Sep 17 00:00:00 2001 From: djcb Date: Mon, 11 Jun 2018 13:06:28 +0300 Subject: [PATCH] guile: require guile 2.2 Drop support for guile2.0 -- mostly because it's installation is different enough between distros that it seems a bit too much work to keep both that and guile2.2 working. --- configure.ac | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 96693d9c..1e423974 100644 --- a/configure.ac +++ b/configure.ac @@ -217,15 +217,13 @@ AM_CONDITIONAL(BUILD_GUI,[test "x$have_webkit" = "xyes" -a "x$have_gtk" = "xyes" ############################################################################### -# build with guile when available and not disabled. +# build with guile2.2 when available and not disabled. AC_ARG_ENABLE([guile], AS_HELP_STRING([--disable-guile],[Disable guile])) AS_IF([test "x$enable_guile" != "xno"],[ - PKG_CHECK_MODULES(guile_20, guile-2.0, [have_guile20=yes],[have_guile20=no]) PKG_CHECK_MODULES(guile_22, guile-2.2, [have_guile22=yes],[have_guile22=no]) - # this is a bit hacky; GUILE_PKG - AS_IF([test "x$have_guile20" = "xyes" -o "x$have_guile22" = "xyes"],[ - GUILE_PKG([2.2 2.0]) + AS_IF([test "x$have_guile22" = "xyes"],[ + GUILE_PKG([2.2]) GUILE_PROGS GUILE_FLAGS AC_DEFINE_UNQUOTED([GUILE_BINARY],"$GUILE",[guile binary])