From ca34fc317f7a812285805f0cc6b41ccae6d57434 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 9 Oct 2015 20:53:55 +0200
Subject: 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.
---
 configure.ac | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'configure.ac')

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
-- 
cgit v1.2.3