From 28f436a904cbfc2d7bb6e5e8d91de23c03b134b0 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 12 Oct 2018 15:04:44 +0200 Subject: build: Remove obsolete reference to 'GUIX_ASSERT_LIBGCRYPT_USABLE'. Reported by Mark H Weaver . Fixes . * configure.ac: Remove use of 'GUIX_ASSERT_LIBGCRYPT_USABLE'. Add "^GUIX_" to the forbidden M4 patterns. --- configure.ac | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index c83d4d8a28..104a0e4b09 100644 --- a/configure.ac +++ b/configure.ac @@ -88,6 +88,7 @@ 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([^GUIX_]) dnl Search for 'guile' and 'guild'. This macro defines dnl 'GUILE_EFFECTIVE_VERSION'. @@ -232,8 +233,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 -- cgit v1.2.3 From dde49cfe5312b95f44060155256036532f3cb22a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 12 Oct 2018 15:09:56 +0200 Subject: build: Fine-tune the forbidden M4 patterns. * configure.ac: Forbid "^GUILE_P", allow "^GUILE_PKG_ERRORS". --- configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 104a0e4b09..2a1edbc321 100644 --- a/configure.ac +++ b/configure.ac @@ -87,7 +87,8 @@ 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 -- cgit v1.2.3