diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-05-22 10:38:41 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-05-22 10:38:41 +0200 |
| commit | a3977466db0aff6d1d82f3100745982d479bbff3 (patch) | |
| tree | 04bcf4a331c5130064b62bf5bfd6829bfd386cbd | |
| parent | 641f9a2a1f3a1ad0b4c3003a2efc5c7975286cc1 (diff) | |
| download | guix-a3977466db0aff6d1d82f3100745982d479bbff3.tar.gz | |
build: Fix builds without --with-libgcrypt-prefix nor --with-libgcrypt-libdir.
Reported by Manolis Ragkousis <manolis837@gmail.com>. Fixes a regression introduced in 14af289. Before this commit, ./configure would leave LIBGCRYPT_PREFIX and LIBGCRYPT_LIBDIR undefined, leading to LIBGCRYPT_LIBS="-L -lgcrypt" and thus to a link failure. * configure.ac: Make sure $LIBGCRYPT_PREFIX and $LIBGCRYPT_LIBDIR are never empty.
| -rw-r--r-- | configure.ac | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 7b2a0e4dd5..d65211779c 100644 --- a/configure.ac +++ b/configure.ac @@ -124,7 +124,9 @@ AC_ARG_WITH([libgcrypt-prefix], LIBGCRYPT_LIBDIR="$withval/lib" ;; esac], - [LIBGCRYPT="libgcrypt"]) + [LIBGCRYPT="libgcrypt" + LIBGCRYPT_PREFIX="no" + LIBGCRYPT_LIBDIR="no"]) AC_ARG_WITH([libgcrypt-libdir], [AS_HELP_STRING([--with-libgcrypt-libdir=DIR], @@ -141,6 +143,9 @@ AC_ARG_WITH([libgcrypt-libdir], esac], [if test "x$LIBGCRYPT" = x; then LIBGCRYPT="libgcrypt" + fi + if test "x$LIBGCRYPT_LIBDIR" = x; then + LIBGCRYPT_LIBDIR="no" fi]) dnl Library name suitable for `dynamic-link'. |