diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 2817e6e24d..5d70de4beb 100644 --- a/configure.ac +++ b/configure.ac @@ -93,16 +93,12 @@ m4_pattern_forbid([^GUIX_]) dnl Search for 'guile' and 'guild'. This macro defines dnl 'GUILE_EFFECTIVE_VERSION'. -GUILE_PKG([2.2 2.0]) +GUILE_PKG([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.13]) -fi - dnl Installation directories for .scm and .go files. guilemoduledir="${datarootdir}/guile/site/$GUILE_EFFECTIVE_VERSION" guileobjectdir="${libdir}/guile/$GUILE_EFFECTIVE_VERSION/site-ccache" @@ -139,6 +135,21 @@ if test "x$have_guile_gcrypt" != "xyes"; then AC_MSG_ERROR([Guile-Gcrypt could not be found; please install it.]) fi +dnl Guile-newt is used by the graphical installer. +GUILE_MODULE_AVAILABLE([have_guile_newt], [(newt)]) + +AC_ARG_ENABLE([installer], + AS_HELP_STRING([--enable-installer], [Build the graphical installer sources.])) + +AS_IF([test "x$enable_installer" = "xyes"], [ +if test "x$have_guile_newt" != "xyes"; then + AC_MSG_ERROR([Guile-newt could not be found; please install it.]) +fi +]) + +AM_CONDITIONAL([ENABLE_INSTALLER], + [test "x$enable_installer" = "xyes"]) + dnl Make sure we have a full-fledged Guile. GUIX_ASSERT_GUILE_FEATURES([regex posix socket net-db threads]) |