From d388c2c435395aee61dc074023b1f218e6037545 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 3 Nov 2012 21:43:30 +0100 Subject: build: Require GNU libgcrypt. * guix/utils.scm (sha256): Remove Coreutils- and libchop-based implementations. * README: Update accordingly. * m4/guix.m4: New file. * configure.ac: Use `GUIX_ASSERT_LIBGCRYPT_USABLE'. Set and substitute `LIBGCRYPT_PREFIX'. * Makefile.am (AM_DISTCHECK_CONFIGURE_FLAGS): Pass `--with-libgcrypt-prefix=$(LIBGCRYPT_PREFIX)'. --- configure.ac | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 6d3d1482b4..cd07a54a3d 100644 --- a/configure.ac +++ b/configure.ac @@ -65,9 +65,11 @@ AC_ARG_WITH([libgcrypt-prefix], [case "$withval" in yes|no) LIBGCRYPT="libgcrypt" + LIBGCRYPT_PREFIX="no" ;; *) LIBGCRYPT="$withval/lib/libgcrypt" + LIBGCRYPT_PREFIX="$withval" ;; esac], [LIBGCRYPT="libgcrypt"]) @@ -76,6 +78,10 @@ dnl Library name suitable for `dynamic-link'. AC_MSG_CHECKING([for libgcrypt shared library name]) AC_MSG_RESULT([$LIBGCRYPT]) AC_SUBST([LIBGCRYPT]) +AC_SUBST([LIBGCRYPT_PREFIX]) + +GUIX_ASSERT_LIBGCRYPT_USABLE + AC_CONFIG_FILES([Makefile po/Makefile.in -- cgit 1.4.1