diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-09-20 23:36:53 +0900 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-09-20 23:36:53 +0900 |
| commit | 9d126aa2b504bb9fad536eac186805ff623e96be (patch) | |
| tree | 895de600bd7dad3f46a3272aef78345cf8f13cfe | |
| parent | e465d9e19087ab150f7e31f21c09e4a147b93b36 (diff) | |
| download | guix-9d126aa2b504bb9fad536eac186805ff623e96be.tar guix-9d126aa2b504bb9fad536eac186805ff623e96be.tar.gz | |
build: Allow builds with Guile 2.2.
Reported by Mu Lei.
* configure.ac: Use 'GUILE_PKG', allowing 2.2.
Use 'GUILE_PROGS' instead of 'AC_PATH_PROG'.
| -rw-r--r-- | configure.ac | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 84287e4289..3b33f851e7 100644 --- a/configure.ac +++ b/configure.ac @@ -74,14 +74,22 @@ dnl We require pkg.m4 (from pkg-config) and guile.m4 (from Guile.) dnl Make sure they are available. m4_pattern_forbid([PKG_CHECK_MODULES]) m4_pattern_forbid([GUILE_MODULE_AVAILABLE]) +m4_pattern_forbid([^GUILE_P$]) -PKG_CHECK_MODULES([GUILE], [guile-2.0 >= 2.0.7]) -AC_PATH_PROG([GUILE], [guile]) -AC_PATH_PROG([GUILD], [guild]) +dnl Search for 'guile' and 'guild'. Prefer 2.0 until the 2.2 upgrade is +dnl complete. +GUILE_PKG([2.0 2.2]) +GUILE_PROGS if test "x$GUILD" = "x"; then AC_MSG_ERROR(['guild' binary not found; please check your guile-2.x installation.]) 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 guile-json is used for the PyPI package importer GUILE_MODULE_AVAILABLE([have_guile_json], [(json)]) AM_CONDITIONAL([HAVE_GUILE_JSON], [test "x$have_guile_json" = "xyes"]) |