diff options
| author | Jan Nieuwenhuizen <janneke@gnu.org> | 2018-10-21 23:18:19 +0200 |
|---|---|---|
| committer | Jan Nieuwenhuizen <janneke@gnu.org> | 2018-10-21 23:19:35 +0200 |
| commit | cf7658f7cb5de0e17f4801faa84c378a4b40033e (patch) | |
| tree | 646fa120d67bb41868a543461700e62aa170b2c0 /configure.ac | |
| parent | 09c5a5680a06011f985a84aa26fb890b3be453bd (diff) | |
| parent | ffddb42d6c510456997ee6de1c1b8026c9ce6d14 (diff) | |
Merge branch 'core-updates' into core-updates-next
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index c83d4d8a28..2a1edbc321 100644 --- a/configure.ac +++ b/configure.ac @@ -87,7 +87,9 @@ 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$]) +m4_pattern_forbid([^GUILE_P]) +m4_pattern_allow([^GUILE_PKG_ERRORS]) +m4_pattern_forbid([^GUIX_]) dnl Search for 'guile' and 'guild'. This macro defines dnl 'GUILE_EFFECTIVE_VERSION'. @@ -232,8 +234,6 @@ AC_SUBST([LIBGCRYPT]) AC_SUBST([LIBGCRYPT_PREFIX]) AC_SUBST([LIBGCRYPT_LIBDIR]) -GUIX_ASSERT_LIBGCRYPT_USABLE - dnl Library name of zlib suitable for 'dynamic-link'. GUIX_LIBZ_LIBDIR([libz_libdir]) if test "x$libz_libdir" = "x"; then |