diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-05-17 15:41:56 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-05-17 16:23:01 +0200 |
| commit | 14af289ed9828850ceb341679e42aaa5db7912ee (patch) | |
| tree | 9c1709425aba494d5b7f79c1f322ade61bbfc4be /config-daemon.ac | |
| parent | 1634c0420e5e8e609f5d52f5bf92eeafff5bfb6a (diff) | |
| download | patches-14af289ed9828850ceb341679e42aaa5db7912ee.tar patches-14af289ed9828850ceb341679e42aaa5db7912ee.tar.gz | |
build: Add --with-libgcrypt-libdir=DIR to support Debian's multi-arch layout.
* configure.ac: Remove 'LIBGCRYPT_PREFIX' and use 'LIBGCRYPT_LIBDIR'
instead. Add --with-libgcrypt-libdir=DIR option.
* Makefile.am (AM_DISTCHECK_CONFIGURE_FLAGS): Pass
'--with-libgcrypt-libdir'.
* config-daemon.ac: Honor $LIBGCRYPT_LIBDIR when computing
LIBGCRYPT_LIBS.
Diffstat (limited to 'config-daemon.ac')
| -rw-r--r-- | config-daemon.ac | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/config-daemon.ac b/config-daemon.ac index 08a72a0c4c..a13525a7f5 100644 --- a/config-daemon.ac +++ b/config-daemon.ac @@ -38,13 +38,21 @@ if test "x$guix_build_daemon" = "xyes"; then case "$LIBGCRYPT_PREFIX" in no) LIBGCRYPT_CFLAGS="" - LIBGCRYPT_LIBS="" ;; *) LIBGCRYPT_CFLAGS="-I$LIBGCRYPT_PREFIX/include" - LIBGCRYPT_LIBS="-L$LIBGCRYPT_PREFIX/lib -lgcrypt" ;; esac + + case "$LIBGCRYPT_LIBDIR" in + no) + LIBGCRYPT_LIBS="-lgcrypt" + ;; + *) + LIBGCRYPT_LIBS="-L$LIBGCRYPT_LIBDIR -lgcrypt" + ;; + esac + AC_SUBST([LIBGCRYPT_CFLAGS]) AC_SUBST([LIBGCRYPT_LIBS]) |