diff options
| -rw-r--r-- | NEWS | 6 | ||||
| -rw-r--r-- | configure.ac | 14 | ||||
| -rw-r--r-- | doc/modules/Makefile.am | 2 | ||||
| -rw-r--r-- | guilec.am (renamed from guile-vm.am) | 6 | ||||
| -rw-r--r-- | src/guile/Makefile.am | 6 |
5 files changed, 13 insertions, 21 deletions
@@ -26,11 +26,7 @@ are not output in a separate file. ** HTML engine: the `charset' custom changes the output encoding ** Lout/LaTeX engine: new `encoding' custom ** Improved rendering of pie charts with Ploticus -** New experimental `--enable-guile-vm' configure switch - -This allows compilation with the compiler of "Guile-VM", i.e., the -future Guile 2.x. - +** On Guile 2.0, modules are compiled and `.go' files are installed ** New test suite (run "make check") ** Various documentation fixes, improvements and additions diff --git a/configure.ac b/configure.ac index 4fe1cee..0585bb0 100644 --- a/configure.ac +++ b/configure.ac @@ -10,11 +10,6 @@ AM_INIT_AUTOMAKE([gnu no-define check-news readme-alpha]) AC_CONFIG_SRCDIR([src/guile/skribilo/reader.scm]) -# Options. -AC_ARG_ENABLE([guile-vm], - [AS_HELP_STRING([--enable-guile-vm], - [compile source files for use with Guile-VM (aka. Guile 2.x)])]) - # GNU Gettext. AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT_VERSION([0.16.1]) @@ -32,11 +27,12 @@ AC_ARG_WITH([guilemoduledir], # Look for Guile. GUILE_PROGS GUILE_SITE_DIR +AC_PATH_PROGS([GUILD], [guild guile-tools]) -# Guile-VM's compiler (aka. Guile 2.0.x). -AM_CONDITIONAL([ENABLE_GUILE_VM], - [test "x$enable_guile_vm" = "xyes" && \ - $GUILE_TOOLS compile --help 2>&1 >/dev/null]) +# GNU Guile 2.0.x and its compiler. +AM_CONDITIONAL([HAVE_GUILE2], + [test "x$GUILD" != "x" && \ + "$GUILD" compile --help 2>&1 >/dev/null]) # Need Guile-Reader. GUILE_MODULE_REQUIRED([system reader]) diff --git a/doc/modules/Makefile.am b/doc/modules/Makefile.am index ca3459f..beccfd7 100644 --- a/doc/modules/Makefile.am +++ b/doc/modules/Makefile.am @@ -13,4 +13,4 @@ CLEANFILES = SUFFIXES = -include $(top_srcdir)/guile-vm.am +include $(top_srcdir)/guilec.am @@ -1,7 +1,7 @@ # Compilation with Guile-VM's compiler (aka. Guile 2.x). -if ENABLE_GUILE_VM +if HAVE_GUILE2 # XXX: This expression relies on a GNU extension. GOBJECTS = $(SOURCES:%.scm=%.go) @@ -40,9 +40,9 @@ SUFFIXES += .go skr_install_go_files = install-nobase_nodist_moduleDATA $(skr_install_go_files): install-nobase_dist_moduleDATA -else !ENABLE_GUILE_VM +else !HAVE_GUILE2 nobase_dist_module_DATA = $(SOURCES) $(SOURCES_NOT_COMPILED) nobase_nodist_module_DATA = -endif !ENABLE_GUILE_VM +endif !HAVE_GUILE2 diff --git a/src/guile/Makefile.am b/src/guile/Makefile.am index 9c2c706..c853b50 100644 --- a/src/guile/Makefile.am +++ b/src/guile/Makefile.am @@ -77,20 +77,20 @@ SOURCES += \ CLEANFILES = $(nobase_nodist_module_DATA) include $(top_srcdir)/substitute.am -include $(top_srcdir)/guile-vm.am +include $(top_srcdir)/guilec.am # Generated files not part of the distribution. nobase_nodist_module_DATA += \ skribilo/config.scm \ skribilo/utils/images.scm -if ENABLE_GUILE_VM +if HAVE_GUILE2 nobase_nodist_module_DATA += \ skribilo/config.go \ skribilo/utils/images.go -endif ENABLE_GUILE_VM +endif HAVE_GUILE2 BUILT_SOURCES = \ |