From 426b9a50c7d84db21f20b4528413c7bd6cc2c0fc Mon Sep 17 00:00:00 2001
From: djcb <djcb@djcbsoftware.nl>
Date: Mon, 21 May 2018 15:03:58 +0300
Subject: [PATCH] guile: optionally allow guile2.2

---
 configure.ac      | 36 +++++++++++++++++++++++++++++++++---
 guile/Makefile.am |  2 +-
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 85dc176c..330842cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -218,7 +218,36 @@ build_guile=no
 AC_ARG_ENABLE([guile],
    AS_HELP_STRING([--disable-guile],[Disable guile]))
 
+#
+# guile 2.2
+#
 AS_IF([test "x$enable_guile" != "xno"], [
+   PKG_CHECK_MODULES(GUILE,guile-2.2,[build_guile=yes],[build_guile=no])
+   AC_SUBST(GUILE_CFLAGS)
+   AC_SUBST(GUILE_LIBS)
+
+   GUILE_EXECDIR="`${PKG_CONFIG} guile-2.2 --variable=exec_prefix`/bin"
+
+   AS_IF([test "x$build_guile" = "xyes"],[
+   AC_PATH_PROG(GUILE_BINARY, [guile2.2], [], [$GUILE_EXECDIR])
+      AS_IF([test "x$GUILE_BINARY" != "x"],
+	 [AC_DEFINE_UNQUOTED([GUILE_BINARY],["$GUILE_BINARY"],[Path to the guile binary])],
+	 [AC_MSG_WARN([cannot find guile-snarf])])])
+
+   AS_IF([test "x$build_guile" = "xyes"],[
+      AC_PATH_PROG(GUILE_SNARF, [guile-snarf2.2], [], [$GUILE_EXECDIR])
+      AS_IF([test "x$GUILE_SNARF" != "x"],
+	 [AC_DEFINE_UNQUOTED([GUILE_SNARF],["$GUILE_SNARF"],[Path to guile-snarf])
+	 GUILE_SITEDIR="`${PKG_CONFIG} guile-2.2 --variable=sitedir`"],
+	 [AC_MSG_WARN([cannot find guile-snarf])])])
+   AC_SUBST(GUILE_SITEDIR)
+   guile_version="$(${PKG_CONFIG} --modversion guile-2.2)"
+])
+
+#
+# still support guile 2.0
+#
+AS_IF([test "x$enable_guile" != "xno" -a "x$build_guile" = "xno"], [
    PKG_CHECK_MODULES(GUILE,guile-2.0,[build_guile=yes],[build_guile=no])
    AC_SUBST(GUILE_CFLAGS)
    AC_SUBST(GUILE_LIBS)
@@ -237,11 +266,12 @@ AS_IF([test "x$enable_guile" != "xno"], [
 	 [AC_DEFINE_UNQUOTED([GUILE_SNARF],["$GUILE_SNARF"],[Path to guile-snarf])
 	 GUILE_SITEDIR="`${PKG_CONFIG} guile-2.0 --variable=sitedir`"],
 	 [AC_MSG_WARN([cannot find guile-snarf])])])
-   AC_SUBST(GUILE_SITEDIR)])
+   AC_SUBST(GUILE_SITEDIR)
+   guile_version="$(${PKG_CONFIG} --modversion guile-2.0)"
+])
 
 AS_IF([test "x$build_guile" = "xyes" -a "x$GUILE_SNARF" != "x"],
-      [guile_version="`${PKG_CONFIG} --modversion guile-2.0`"
-      AC_DEFINE_UNQUOTED([BUILD_GUILE],1,[Whether we build with guile 2.0 support])])
+    AC_DEFINE_UNQUOTED([BUILD_GUILE],1,[Whether we build with guilesupport]))
 AM_CONDITIONAL(BUILD_GUILE, [test "x$build_guile" = "xyes"])
 ###############################################################################
 
diff --git a/guile/Makefile.am b/guile/Makefile.am
index 32c11dee..e63c1b06 100644
--- a/guile/Makefile.am
+++ b/guile/Makefile.am
@@ -72,4 +72,4 @@ EXTRA_DIST=$(scm_DATA)
 ## Add -MG to make the .x magic work with auto-dep code.
 MKDEP = $(CC) -M -MG $(snarfcppopts)
 
-DISTCLEANFILES=$(XFILES)
+CLEANFILES=$(XFILES)