me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Ludovic Courtès 2015-10-09 20:53:55 +02:00
parent 1de2fe95e0
commit ca34fc317f
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config-daemon.ac
View File

@ -51,7 +51,7 @@ if test "x$guix_build_daemon" = "xyes"; then
no) no)
LIBGCRYPT_LIBS="-lgcrypt" LIBGCRYPT_LIBS="-lgcrypt"
;; ;;
*) *)
LIBGCRYPT_LIBS="-L$LIBGCRYPT_LIBDIR -lgcrypt" LIBGCRYPT_LIBS="-L$LIBGCRYPT_LIBDIR -lgcrypt"
;; ;;
esac esac

3
configure.ac
View File

@ -169,6 +169,9 @@ case "x$LIBGCRYPT_PREFIX$LIBGCRYPT_LIBDIR" in
GUIX_LIBGCRYPT_LIBDIR([LIBGCRYPT_LIBDIR]) GUIX_LIBGCRYPT_LIBDIR([LIBGCRYPT_LIBDIR])
if test "x$LIBGCRYPT_LIBDIR" != x; then if test "x$LIBGCRYPT_LIBDIR" != x; then
LIBGCRYPT="$LIBGCRYPT_LIBDIR/libgcrypt" LIBGCRYPT="$LIBGCRYPT_LIBDIR/libgcrypt"
else
dnl 'config-daemon.ac' expects "no" in this case.
LIBGCRYPT_LIBDIR="no"
fi fi
;; ;;
esac esac

2
m4/guix.m4
View File

@ -279,7 +279,7 @@ AC_DEFUN([GUIX_LIBGCRYPT_LIBDIR], [
AC_CACHE_CHECK([libgcrypt's library directory], AC_CACHE_CHECK([libgcrypt's library directory],
[guix_cv_libgcrypt_libdir], [guix_cv_libgcrypt_libdir],
[if test "x$LIBGCRYPT_CONFIG" != "x"; then [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 else
guix_cv_libgcrypt_libdir="" guix_cv_libgcrypt_libdir=""
fi]) fi])