| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | From a9261fee4a41045c42e0d292237cee532e11982c Mon Sep 17 00:00:00 2001 |
| 2 | From: Adrian <adrian.freihofer@gmail.com> |
| 3 | Date: Thu, 27 Nov 2014 15:43:26 +0100 |
| 4 | Subject: [PATCH] add pkg config for libgcrypt |
| 5 | |
| 6 | --- |
| 7 | configure.ac | 18 +++++++----------- |
| 8 | 1 file changed, 7 insertions(+), 11 deletions(-) |
| 9 | |
| 10 | diff --git a/configure.ac b/configure.ac |
| 11 | index 94b0758..654a015 100644 |
| 12 | --- a/configure.ac |
| 13 | +++ b/configure.ac |
| 14 | @@ -480,17 +480,13 @@ if test x"$ac_crypto" = xnss; then |
| 15 | with_nss=yes |
| 16 | elif test x"$ac_crypto" = xgnutls; then |
| 17 | PKG_CHECK_MODULES(GNUTLS, [gnutls >= 1.2]) |
| 18 | - AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no) |
| 19 | - if test x"$LIBGCRYPT_CONFIG" = xno; then |
| 20 | - AC_MSG_ERROR([gnutls explicitly requested but gcrypt not found on system]) |
| 21 | - else |
| 22 | - AC_DEFINE(HAVE_GNUTLS, 1, [Define if you have libgnutls]) |
| 23 | - LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags` |
| 24 | - LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs` |
| 25 | - AC_SUBST(LIBGCRYPT_CFLAGS) |
| 26 | - AC_SUBST(LIBGCRYPT_LIBS) |
| 27 | - with_gnutls=yes |
| 28 | - fi |
| 29 | + AC_DEFINE(HAVE_GNUTLS, 1, [Define if you have libgnutls]) |
| 30 | + PKG_CHECK_MODULES(LIBGCRYPT, [libgcrypt >= 1.1.42], [ |
| 31 | + AC_DEFINE(HAVE_GCRYPT, 1, [Define if gcrypt library is available.]) |
| 32 | + with_gnutls=yes |
| 33 | + ], [ |
| 34 | + AC_MSG_ERROR([gnutls explicitly requested but gcrypt not found on system]) |
| 35 | + ]) |
| 36 | else |
| 37 | AC_MSG_ERROR([Please choose either 'nss' or 'gnutls' for certificate and crypto operations]) |
| 38 | fi |
| 39 | -- |
| 40 | 1.9.1 |
| 41 | |