diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-09-30 12:01:32 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-09-30 12:05:27 +0200 |
| commit | 79355ae3e84359716f5135cc7083e72246bc8bf9 (patch) | |
| tree | 6b61851e2153581578bb78ef0f177b8841ee5db7 /configure.ac | |
| parent | 39d6b9c99f297e14fc4f47f002be3d40556726be (diff) | |
| parent | 86d8f6d3efb8300a3354735cbf06be6c01e23243 (diff) | |
| download | guix-79355ae3e84359716f5135cc7083e72246bc8bf9.tar guix-79355ae3e84359716f5135cc7083e72246bc8bf9.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 13a9b6e19f..3b33f851e7 100644 --- a/configure.ac +++ b/configure.ac @@ -41,6 +41,13 @@ AC_ARG_WITH([bash-completion-dir], [bashcompletiondir='${sysconfdir}/bash_completion.d']) AC_SUBST([bashcompletiondir]) +AC_ARG_WITH([zsh-completion-dir], + AC_HELP_STRING([--with-zsh-completion-dir=DIR], + [name of the Zsh completion directory]), + [zshcompletiondir="$withval"], + [zshcompletiondir='${datadir}/zsh/site-functions']) +AC_SUBST([zshcompletiondir]) + dnl Better be verbose. AC_MSG_CHECKING([for the store directory]) AC_MSG_RESULT([$storedir]) @@ -67,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"]) |