nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build: No longer substitute 'LIBGCRYPT'. 

This had become useless since ca71942445.

* configure.ac (LIBGCRYPT): Remove.
* guix/config.scm.in (%libgcrypt): Remove.
This commit is contained in:
Ludovic Courtès 2019-04-16 23:32:39 +02:00
parent ab77b69eca
commit f2d86ed0b3
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@ -202,7 +202,6 @@ else
AC_MSG_RESULT([not found]) AC_MSG_RESULT([not found])
fi fi
LIBGCRYPT="libgcrypt"
LIBGCRYPT_LIBDIR="no" LIBGCRYPT_LIBDIR="no"
LIBGCRYPT_PREFIX="no" LIBGCRYPT_PREFIX="no"
@ -212,7 +211,6 @@ AC_ARG_WITH([libgcrypt-prefix],
yes|no) yes|no)
;; ;;
*) *)
LIBGCRYPT="$withval/lib/libgcrypt"
LIBGCRYPT_PREFIX="$withval" LIBGCRYPT_PREFIX="$withval"
LIBGCRYPT_LIBDIR="$withval/lib" LIBGCRYPT_LIBDIR="$withval/lib"
;; ;;
@ -223,11 +221,9 @@ AC_ARG_WITH([libgcrypt-libdir],
[search for GNU libgcrypt's shared library in DIR])], [search for GNU libgcrypt's shared library in DIR])],
[case "$withval" in [case "$withval" in
yes|no) yes|no)
LIBGCRYPT="libgcrypt"
LIBGCRYPT_LIBDIR="no" LIBGCRYPT_LIBDIR="no"
;; ;;
*) *)
LIBGCRYPT="$withval/libgcrypt"
LIBGCRYPT_LIBDIR="$withval" LIBGCRYPT_LIBDIR="$withval"
;; ;;
esac]) esac])
@ -240,10 +236,6 @@ case "x$LIBGCRYPT_PREFIX$LIBGCRYPT_LIBDIR" in
;; ;;
esac 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_PREFIX])
AC_SUBST([LIBGCRYPT_LIBDIR]) AC_SUBST([LIBGCRYPT_LIBDIR])

4
guix/config.scm.in
View File

@ -33,7 +33,6 @@
%config-directory %config-directory
%system %system
%libgcrypt
%libz %libz
%gzip %gzip
%bzip2 %bzip2
@ -88,9 +87,6 @@
(define %system (define %system
"@guix_system@") "@guix_system@")
(define %libgcrypt
"@LIBGCRYPT@")
(define %libz (define %libz
"@LIBZ@") "@LIBZ@")