diff options
| author | Leo Famulari <leo@famulari.name> | 2016-10-26 18:59:28 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2016-10-26 19:00:06 -0400 |
| commit | 02c73adcdf0f29dbecd9a1bb3c9be3626cd5dea9 (patch) | |
| tree | fb8fadc87f5b82dc35f44831af8b79eec37887b3 /configure.ac | |
| parent | a19da40630138acea7169491a6926e00cf7d301b (diff) | |
| parent | 5d73e3000030006b00e7e6644f3ced5d6176376e (diff) | |
| download | guix-02c73adcdf0f29dbecd9a1bb3c9be3626cd5dea9.tar guix-02c73adcdf0f29dbecd9a1bb3c9be3626cd5dea9.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 3b33f851e7..34f1323792 100644 --- a/configure.ac +++ b/configure.ac @@ -21,9 +21,6 @@ AC_USE_SYSTEM_EXTENSIONS AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT_VERSION([0.18.1]) -guilemoduledir="${datarootdir}/guile/site/2.0" -AC_SUBST([guilemoduledir]) - GUIX_SYSTEM_TYPE GUIX_ASSERT_SUPPORTED_SYSTEM @@ -77,7 +74,7 @@ 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. +dnl complete. This macro defines 'GUILE_EFFECTIVE_VERSION'. GUILE_PKG([2.0 2.2]) GUILE_PROGS if test "x$GUILD" = "x"; then @@ -90,6 +87,10 @@ else AC_MSG_WARN([Guile $GUILE_EFFECTIVE_VERSION is not fully supported!]) fi +dnl Installation directory for .scm and .go files. +guilemoduledir="${datarootdir}/guile/site/$GUILE_EFFECTIVE_VERSION" +AC_SUBST([guilemoduledir]) + 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"]) |