Browse Source

build: No longer substitute 'LIBGCRYPT'.

This had become useless since ca71942445.

* configure.ac (LIBGCRYPT): Remove.
* guix/config.scm.in (%libgcrypt): Remove.
gn-latest-20200428
Ludovic Courtès 2 years ago
parent
commit
f2d86ed0b3
No known key found for this signature in database GPG Key ID: 90B11993D9AEBB5
  1. 8
      configure.ac
  2. 4
      guix/config.scm.in

8
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])

4
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@")

Loading…
Cancel
Save