diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-10-09 20:53:55 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-10-09 20:57:24 +0200 |
| commit | ca34fc317f7a812285805f0cc6b41ccae6d57434 (patch) | |
| tree | 46c484f904014f20acef0687d26420abb0e67181 /configure.ac | |
| parent | 1de2fe95e017c42aacbaa34f5dab8d48249cc064 (diff) | |
| download | guix-ca34fc317f7a812285805f0cc6b41ccae6d57434.tar guix-ca34fc317f7a812285805f0cc6b41ccae6d57434.tar.gz | |
build: Fix libgcrypt detection on FHS systems.
Reported by Christopher Allan Webber <cwebber@dustycloud.org>.
* m4/guix.m4 (GUIX_LIBGCRYPT_LIBDIR): Add "grep -e -L" to the pipeline
to account for cases where the output of "libgcrypt-config --libs"
lacks a -L flag.
* configure.ac: When 'GUIX_LIBGCRYPT_LIBDIR' returns the empty string,
set LIBGCRYPT_LIBDIR to "no".
* config-daemon.ac: Add missing space.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 38e9ec56b7..bb3d947535 100644 --- a/configure.ac +++ b/configure.ac @@ -169,6 +169,9 @@ case "x$LIBGCRYPT_PREFIX$LIBGCRYPT_LIBDIR" in GUIX_LIBGCRYPT_LIBDIR([LIBGCRYPT_LIBDIR]) if test "x$LIBGCRYPT_LIBDIR" != x; then LIBGCRYPT="$LIBGCRYPT_LIBDIR/libgcrypt" + else + dnl 'config-daemon.ac' expects "no" in this case. + LIBGCRYPT_LIBDIR="no" fi ;; esac |