diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-01 17:10:49 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-01 17:10:49 -0400 |
| commit | 2e65e4834a226c570866f2e8976ed7f252b45cd1 (patch) | |
| tree | 21d625bce8d03627680214df4a6622bf8eb79dc9 /configure.ac | |
| parent | 9c68ecb24dd1660ce736cdcdea0422a73ec318a2 (diff) | |
| parent | f1a3c11407b52004e523ec5de20d326c5661681f (diff) | |
Merge remote-tracking branch 'origin/master' into staging
With resolved conflicts in:
gnu/packages/bittorrent.scm
gnu/packages/databases.scm
gnu/packages/geo.scm
gnu/packages/gnupg.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/python-xyz.scm
gnu/packages/xorg.scm
guix/build/qt-utils.scm
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 32 |
1 files changed, 9 insertions, 23 deletions
diff --git a/configure.ac b/configure.ac index 1598bfae94..84592f6041 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,7 @@ dnl For the C++ code. This must be used early. AC_USE_SYSTEM_EXTENSIONS AM_GNU_GETTEXT([external]) -AM_GNU_GETTEXT_VERSION([0.18.1]) +AM_GNU_GETTEXT_VERSION([0.19.1]) GUIX_SYSTEM_TYPE GUIX_ASSERT_SUPPORTED_SYSTEM @@ -96,16 +96,12 @@ m4_pattern_forbid([^GUIX_]) dnl Search for 'guile' and 'guild'. This macro defines dnl 'GUILE_EFFECTIVE_VERSION'. -GUILE_PKG([3.0 2.2]) +GUILE_PKG([3.0]) GUILE_PROGS if test "x$GUILD" = "x"; then AC_MSG_ERROR(['guild' binary not found; please check your Guile installation.]) fi -if test "x$GUILE_EFFECTIVE_VERSION" = "x2.2"; then - PKG_CHECK_MODULES([GUILE], [guile-2.2 >= 2.2.6]) -fi - dnl Get CFLAGS and LDFLAGS for libguile. GUILE_FLAGS @@ -150,6 +146,13 @@ if test "x$guix_cv_have_recent_guile_git" != "xyes"; then AC_MSG_ERROR([A recent Guile-Git could not be found; please install it.]) fi +dnl Check for the optional Guile-Lib. +GUILE_MODULE_EXPORTS([have_guile_lib], [(htmlprag)], [%strict-tokenizer?]) +AM_CONDITIONAL([HAVE_GUILE_LIB], [test "x$have_guile_lib" = "xyes"]) +AM_COND_IF(HAVE_GUILE_LIB,, + [AC_MSG_WARN([The Guile-Lib requirement was not satisfied (>= 0.2.7); +Some features such as the Go importer will not be usable.])]) + dnl Check for Guile-zlib. GUIX_CHECK_GUILE_ZLIB if test "x$guix_cv_have_recent_guile_zlib" != "xyes"; then @@ -195,23 +198,6 @@ AC_SUBST([GZIP]) AC_SUBST([BZIP2]) AC_SUBST([XZ]) -AC_ARG_WITH([nixpkgs], - [AS_HELP_STRING([--with-nixpkgs=DIR], - [search for Nixpkgs in DIR (for testing purposes only)])], - [case "$withval" in - yes|no) AC_MSG_ERROR([Please use `--with-nixpkgs=DIR'.]);; - *) NIXPKGS="$withval";; - esac], - []) - -AC_MSG_CHECKING([for Nixpkgs source tree]) -if test -f "$NIXPKGS/default.nix"; then - AC_MSG_RESULT([$NIXPKGS]) - AC_SUBST([NIXPKGS]) -else - AC_MSG_RESULT([not found]) -fi - LIBGCRYPT_LIBDIR="no" LIBGCRYPT_PREFIX="no" |