summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorLudovic Courtès2012-05-14 23:45:38 +0200
committerLudovic Courtès2012-05-14 23:45:38 +0200
commit196a4f8ac0f12d9193d14d9d9fa9ced8f9420b9c (patch)
tree59215297dc8840492064f953443d29a87a671f63 /configure.ac
parentbb3c6d7d580aac172a44000625c46ec0ee7baea8 (diff)
downloadskribilo-196a4f8ac0f12d9193d14d9d9fa9ced8f9420b9c.tar.gz
skribilo-196a4f8ac0f12d9193d14d9d9fa9ced8f9420b9c.tar.lz
skribilo-196a4f8ac0f12d9193d14d9d9fa9ced8f9420b9c.zip
Mention "Guile 2.0" instead of "Guile-VM".
* configure.ac: Remove `--enable-guile-vm' option. Check for `guild' and `guile-tools', defining `GUILD'. Rename `ENABLE_GUILE_VM' to `HAVE_GUILE2'. * guile-vm.am: Rename to... * guilec.am: ... this. * doc/modules/Makefile.am, src/guile/Makefile.am: Update accordingly.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac14
1 files changed, 5 insertions, 9 deletions
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])