dan
/
haunt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build: Allow building with Guile 2.2. 

* Makefile.am (moddir, goddir): Remove hardcoded "2.0".
* configure.ac: Check to 2.2 as well.
This commit is contained in:
David Thompson 2016-02-15 19:56:41 -05:00
parent 8b1adf1dcd
commit 5373877f98
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -37,8 +37,8 @@ SUFFIXES = .scm .go
.scm.go: .scm.go:
$(AM_V_GEN)$(top_builddir)/pre-inst-env $(GUILE_TOOLS) compile $(GUILE_WARNINGS) -o "$@" "$<" $(AM_V_GEN)$(top_builddir)/pre-inst-env $(GUILE_TOOLS) compile $(GUILE_WARNINGS) -o "$@" "$<"
moddir=$(prefix)/share/guile/site/2.0 moddir=$(prefix)/share/guile/site/$(GUILE_EFFECTIVE_VERSION)
godir=$(libdir)/guile/2.0/ccache godir=$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/ccache
bin_SCRIPTS = \ bin_SCRIPTS = \
scripts/haunt scripts/haunt

3
configure.ac
View File

@ -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([test-env], [chmod +x test-env])
AC_CONFIG_FILES([scripts/haunt], [chmod +x scripts/haunt]) 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 dnl Guile-reader is needed for Skribe support
GUILE_MODULE_AVAILABLE([have_guile_reader], [(system reader)]) GUILE_MODULE_AVAILABLE([have_guile_reader], [(system reader)])