me
/
guix
Archived
1
0
Fork 0
Code

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'.
master
Ludovic Courtès 2016-09-20 23:36:53 +09:00
parent e465d9e190
commit 9d126aa2b5
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure.ac
View File

@ -74,14 +74,22 @@ dnl We require pkg.m4 (from pkg-config) and guile.m4 (from Guile.)
dnl Make sure they are available. dnl Make sure they are available.
m4_pattern_forbid([PKG_CHECK_MODULES]) m4_pattern_forbid([PKG_CHECK_MODULES])
m4_pattern_forbid([GUILE_MODULE_AVAILABLE]) m4_pattern_forbid([GUILE_MODULE_AVAILABLE])
m4_pattern_forbid([^GUILE_P$])
PKG_CHECK_MODULES([GUILE], [guile-2.0 >= 2.0.7]) dnl Search for 'guile' and 'guild'. Prefer 2.0 until the 2.2 upgrade is
AC_PATH_PROG([GUILE], [guile]) dnl complete.
AC_PATH_PROG([GUILD], [guild]) GUILE_PKG([2.0 2.2])
GUILE_PROGS
if test "x$GUILD" = "x"; then if test "x$GUILD" = "x"; then
AC_MSG_ERROR(['guild' binary not found; please check your guile-2.x installation.]) AC_MSG_ERROR(['guild' binary not found; please check your guile-2.x installation.])
fi 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 dnl guile-json is used for the PyPI package importer
GUILE_MODULE_AVAILABLE([have_guile_json], [(json)]) GUILE_MODULE_AVAILABLE([have_guile_json], [(json)])
AM_CONDITIONAL([HAVE_GUILE_JSON], [test "x$have_guile_json" = "xyes"]) AM_CONDITIONAL([HAVE_GUILE_JSON], [test "x$have_guile_json" = "xyes"])