summary refs log tree commit diff
path: root/configure.ac
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-05-22 10:38:41 +0200
committerLudovic Courtès <ludo@gnu.org>2014-05-22 10:38:41 +0200
commita3977466db0aff6d1d82f3100745982d479bbff3 (patch)
tree04bcf4a331c5130064b62bf5bfd6829bfd386cbd /configure.ac
parent641f9a2a1f3a1ad0b4c3003a2efc5c7975286cc1 (diff)
downloadguix-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.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac7
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'.