From: Matthias Bolte <matthias.bolte@googlemail.com>
Date: Mon, 21 Dec 2009 17:47:12 +0000 (+0100)
Subject: Fix GnuTLS pkg-config check
X-Git-Tag: v0.7.5~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf30da7a2508132e79c38dc50ad9f47d0bbaddff;p=thirdparty%2Flibvirt.git

Fix GnuTLS pkg-config check

The testlogic for $PKG_CONFIG was inverted, checking for an empty string
before using PKG_CHECK_MODULES. Use -x instead of -z and add an else branch
to the if checking for $GNUTLS_FOUND = no to add -lgcrypt in case the
GnuTLS libraries are detected by pkg-config.
---

diff --git a/configure.in b/configure.in
index 81548b8cca..a86b8cabea 100644
--- a/configure.in
+++ b/configure.in
@@ -555,7 +555,7 @@ dnl GnuTLS library
 GNUTLS_CFLAGS=
 GNUTLS_LIBS=
 GNUTLS_FOUND=no
-if test -z "$PKG_CONFIG" ; then
+if test -x "$PKG_CONFIG" ; then
   PKG_CHECK_MODULES(GNUTLS, gnutls >= $GNUTLS_REQUIRED,
      [GNUTLS_FOUND=yes], [GNUTLS_FOUND=no])
 fi
@@ -572,6 +572,8 @@ if test "$GNUTLS_FOUND" = "no"; then
   dnl it explicitly for the calls to gcry_control/check_version
   GNUTLS_LIBS="$LIBS -lgcrypt"
   LIBS="$old_libs"
+else
+  GNUTLS_LIBS="$GNUTLS_LIBS -lgcrypt"
 fi
 
 AC_SUBST([GNUTLS_CFLAGS])