1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
|
From 42a21d223a3d1f2e45c037f2a0570b035bc1a73a Mon Sep 17 00:00:00 2001
From: Andreas Oberritter <obi@opendreambox.org>
Date: Fri, 7 Feb 2020 13:25:51 +0100
Subject: [PATCH] configure.ac: Use pkg-config for libgcrypt
Not upstreamable, because libgcrypt upstream doesn't support pkg-config.
---
configure.ac | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/configure.ac b/configure.ac
index b90d46a..8faa914 100644
--- a/configure.ac
+++ b/configure.ac
@@ -110,19 +110,7 @@ AC_CHECK_FUNC([snprintf],, [AC_MSG_ERROR($function_not_found)])
dnl required libraries
dnl gcrypt check
-AM_PATH_LIBGCRYPT([1.6.0], [have_gcrypt=yes])
-AS_IF([test "x$have_gcrypt" != xyes],[
- dnl older gcrypt requires pthread
- AM_PATH_LIBGCRYPT([1.1.94],,
- AC_MSG_ERROR([libgcrypt not found on system]))
- dnl pthread check (not on win32)
- AS_IF([test "${SYS}" != "mingw32"], [
- AC_CHECK_HEADERS([pthread.h], ,
- [AC_MSG_ERROR([pthread required])])
- AC_SEARCH_LIBS([pthread_create], [pthread], ,
- [AC_MSG_ERROR([pthread required])])
- ])
- ])
+PKG_CHECK_MODULES(LIBGCRYPT,[libgcrypt >= 1.6.0])
dnl use re-entrant version of gcrypt_error() from gpg-error
AC_FUNC_STRERROR_R
|
