From f2d86ed0b3e371ee95cbc0098b7b2ccb757bc948 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 16 Apr 2019 23:32:39 +0200
Subject: [PATCH] build: No longer substitute 'LIBGCRYPT'.

This had become useless since ca719424455465fca4b872c371daf2a46de88b33.

* configure.ac (LIBGCRYPT): Remove.
* guix/config.scm.in (%libgcrypt): Remove.
---
 configure.ac       | 8 --------
 guix/config.scm.in | 4 ----
 2 files changed, 12 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5d70de4beb..7e7ae02730 100644
--- a/configure.ac
+++ b/configure.ac
@@ -202,7 +202,6 @@ else
    AC_MSG_RESULT([not found])
 fi
 
-LIBGCRYPT="libgcrypt"
 LIBGCRYPT_LIBDIR="no"
 LIBGCRYPT_PREFIX="no"
 
@@ -212,7 +211,6 @@ AC_ARG_WITH([libgcrypt-prefix],
     yes|no)
       ;;
     *)
-      LIBGCRYPT="$withval/lib/libgcrypt"
       LIBGCRYPT_PREFIX="$withval"
       LIBGCRYPT_LIBDIR="$withval/lib"
       ;;
@@ -223,11 +221,9 @@ AC_ARG_WITH([libgcrypt-libdir],
      [search for GNU libgcrypt's shared library in DIR])],
   [case "$withval" in
     yes|no)
-      LIBGCRYPT="libgcrypt"
       LIBGCRYPT_LIBDIR="no"
       ;;
     *)
-      LIBGCRYPT="$withval/libgcrypt"
       LIBGCRYPT_LIBDIR="$withval"
       ;;
    esac])
@@ -240,10 +236,6 @@ case "x$LIBGCRYPT_PREFIX$LIBGCRYPT_LIBDIR" in
     ;;
 esac
 
-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])
 AC_SUBST([LIBGCRYPT_LIBDIR])
 
diff --git a/guix/config.scm.in b/guix/config.scm.in
index d2ec9921c6..247b15ed81 100644
--- a/guix/config.scm.in
+++ b/guix/config.scm.in
@@ -33,7 +33,6 @@
             %config-directory
 
             %system
-            %libgcrypt
             %libz
             %gzip
             %bzip2
@@ -88,9 +87,6 @@
 (define %system
   "@guix_system@")
 
-(define %libgcrypt
-  "@LIBGCRYPT@")
-
 (define %libz
   "@LIBZ@")