diff options
| author | David Thompson <dthompson2@worcester.edu> | 2016-02-15 19:56:41 -0500 |
|---|---|---|
| committer | David Thompson <dthompson2@worcester.edu> | 2016-02-15 19:56:41 -0500 |
| commit | 5373877f989689209616109b13fd471b2d093b5f (patch) | |
| tree | 84ca709ff8ffbb9b9856af010e330fbc82ed9324 | |
| parent | 8b1adf1dcda1575a8c25710e8fbad1958785813b (diff) | |
build: Allow building with Guile 2.2.
* Makefile.am (moddir, goddir): Remove hardcoded "2.0".
* configure.ac: Check to 2.2 as well.
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 4d49aba..6f65ddc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -37,8 +37,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.0 -godir=$(libdir)/guile/2.0/ccache +moddir=$(prefix)/share/guile/site/$(GUILE_EFFECTIVE_VERSION) +godir=$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/ccache bin_SCRIPTS = \ scripts/haunt diff --git a/configure.ac b/configure.ac index 5741840..a37eb95 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,8 @@ AC_CONFIG_FILES([pre-inst-env], [chmod +x pre-inst-env]) AC_CONFIG_FILES([test-env], [chmod +x test-env]) AC_CONFIG_FILES([scripts/haunt], [chmod +x scripts/haunt]) -GUILE_PROGS([2.0.11]) +GUILE_PKG([2.2 2.0]) +GUILE_PROGS dnl Guile-reader is needed for Skribe support GUILE_MODULE_AVAILABLE([have_guile_reader], [(system reader)]) |