From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Thu, 31 Oct 2019 14:39:40 +0000 (+0100)
Subject: build: Prepare for guile 3.
X-Git-Url: https://jxself.org/git/?p=8sync.git;a=commitdiff_plain;h=e94593c666b97ff7885d35e1fafe35ba5643f082

build: Prepare for guile 3.

* configure.ac: Check for guile 3.0 too.
* Makefile.am: Install in site-ccache.
---

diff --git a/Makefile.am b/Makefile.am
index 926d755..fd2f191 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,8 +41,8 @@ SUFFIXES = .scm .go
 .scm.go:
 	$(AM_V_GEN)$(top_builddir)/pre-inst-env $(GUILE_TOOLS) compile $(GUILE_WARNINGS) -o "$@" "$<"
 
-moddir=$(prefix)/share/guile/site/2.2
-godir=$(libdir)/guile/2.2/ccache
+moddir=$(guilemoduledir)
+godir=$(guileobjectdir)
 
 SOURCES =  \
 	8sync.scm					\
diff --git a/configure.ac b/configure.ac
index 004fec1..5114d4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,10 @@
 AC_INIT([8sync], [0.4.2], [cwebber@dustycloud.org])
 
-PKG_CHECK_MODULES([GUILE], [guile-2.2])
+GUILE_PKG([3.0 2.2])
+guilemoduledir="${datarootdir}/guile/site/$GUILE_EFFECTIVE_VERSION"
+guileobjectdir="${libdir}/guile/$GUILE_EFFECTIVE_VERSION/site-ccache"
+AC_SUBST([guilemoduledir])
+AC_SUBST([guileobjectdir])
 
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])