diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-03-15 17:52:26 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-03-15 17:52:26 +0100 |
| commit | 4b7e5c1131430f10e6211879836cf17447ef5bbc (patch) | |
| tree | 54155070ec4044a78c1abf20f879fded47b5baf2 /configure.ac | |
| parent | adb984d23c003d5d48ada47bf5ad8105a3b8e412 (diff) | |
| parent | 608e42e7c92114497e7908980424288079acee1e (diff) | |
| download | patches-4b7e5c1131430f10e6211879836cf17447ef5bbc.tar patches-4b7e5c1131430f10e6211879836cf17447ef5bbc.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index e5daadb121..3bf2bf1610 100644 --- a/configure.ac +++ b/configure.ac @@ -73,9 +73,9 @@ m4_pattern_forbid([PKG_CHECK_MODULES]) m4_pattern_forbid([GUILE_MODULE_AVAILABLE]) m4_pattern_forbid([^GUILE_P$]) -dnl Search for 'guile' and 'guild'. Prefer 2.0 until the 2.2 upgrade is -dnl complete. This macro defines 'GUILE_EFFECTIVE_VERSION'. -GUILE_PKG([2.0 2.2]) +dnl Search for 'guile' and 'guild'. This macro defines +dnl 'GUILE_EFFECTIVE_VERSION'. +GUILE_PKG([2.2 2.0]) GUILE_PROGS if test "x$GUILD" = "x"; then AC_MSG_ERROR(['guild' binary not found; please check your guile-2.x installation.]) @@ -83,8 +83,6 @@ fi if test "x$GUILE_EFFECTIVE_VERSION" = "x2.0"; then PKG_CHECK_MODULES([GUILE], [guile-2.0 >= 2.0.7]) -else - AC_MSG_WARN([Guile $GUILE_EFFECTIVE_VERSION is not fully supported!]) fi dnl Installation directory for .scm and .go files. |