Paste number 156523: guix vs. libgcrypt auto-detection

Index of paste annotations: 1

Paste number 156523: guix vs. libgcrypt auto-detection
Pasted by: civodul
When:6 years, 1 month ago
Share:Tweet this! | http://paste.lisp.org/+3CRV
Channel:None
Paste contents:
Raw Source | XML | Display As
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])

Annotations for this paste:

Annotation number 1: continuation
Pasted by: civodul
When:6 years, 1 month ago
Share:Tweet this! | http://paste.lisp.org/+3CRV/1
Paste contents:
Raw Source | Display As
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

Colorize as:
Show Line Numbers

Lisppaste pastes can be made by anyone at any time. Imagine a fearsomely comprehensive disclaimer of liability. Now fear, comprehensively.