[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: build: Fix libgcrypt detection on FHS systems.
From: |
Ludovic Courtès |
Subject: |
01/02: build: Fix libgcrypt detection on FHS systems. |
Date: |
Fri, 09 Oct 2015 18:57:42 +0000 |
civodul pushed a commit to branch master
in repository guix.
commit ca34fc317f7a812285805f0cc6b41ccae6d57434
Author: Ludovic Courtès <address@hidden>
Date: Fri Oct 9 20:53:55 2015 +0200
build: Fix libgcrypt detection on FHS systems.
Reported by Christopher Allan Webber <address@hidden>.
* 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.
---
config-daemon.ac | 2 +-
configure.ac | 3 +++
m4/guix.m4 | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/config-daemon.ac b/config-daemon.ac
index f96cc8f..8c1c776 100644
--- a/config-daemon.ac
+++ b/config-daemon.ac
@@ -51,7 +51,7 @@ if test "x$guix_build_daemon" = "xyes"; then
no)
LIBGCRYPT_LIBS="-lgcrypt"
;;
- *)
+ *)
LIBGCRYPT_LIBS="-L$LIBGCRYPT_LIBDIR -lgcrypt"
;;
esac
diff --git a/configure.ac b/configure.ac
index 38e9ec5..bb3d947 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
diff --git a/m4/guix.m4 b/m4/guix.m4
index d464a47..842249a 100644
--- a/m4/guix.m4
+++ b/m4/guix.m4
@@ -279,7 +279,7 @@ AC_DEFUN([GUIX_LIBGCRYPT_LIBDIR], [
AC_CACHE_CHECK([libgcrypt's library directory],
[guix_cv_libgcrypt_libdir],
[if test "x$LIBGCRYPT_CONFIG" != "x"; then
- guix_cv_libgcrypt_libdir=`$LIBGCRYPT_CONFIG --libs | sed -e
"s/.*-L\([[^ ]]\+\)[[[:blank:]]]\+-lgcrypt.*/\1/g"`
+ guix_cv_libgcrypt_libdir=`$LIBGCRYPT_CONFIG --libs | grep -e -L | sed
-e "s/.*-L\([[^ ]]\+\)[[[:blank:]]]\+-lgcrypt.*/\1/g"`
else
guix_cv_libgcrypt_libdir=""
fi])