diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-04-23 19:43:59 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-04-23 19:43:59 +0200 |
| commit | 37da4fbe1562583589eeddb4be8e11bece80fd35 (patch) | |
| tree | 4d8a454b27e62f9b8d7b0fe641a9f6aa6de2402c /configure.ac | |
| parent | 73326e742d82b6706333885eca770f7518636b1f (diff) | |
| parent | e01bd1a67447c1f2a2b5b03e8ea8fbbccd2cd5bd (diff) | |
| download | guix-37da4fbe1562583589eeddb4be8e11bece80fd35.tar guix-37da4fbe1562583589eeddb4be8e11bece80fd35.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 0 insertions, 8 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]) |