blob: 49d633b5f787b1869b23b0aec591db383dfa2414 (
plain)
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
36
37
38
39
40
41
42
43
44
45
46
|
From 5f7cdd2b878298577accade43a38e1a0951d17b4 Mon Sep 17 00:00:00 2001
From: Haiqing Bai <Haiqing.Bai@windriver.com>
Date: Fri, 9 Dec 2016 15:23:17 +0800
Subject: [PATCH] nettle: check header files of openssl only if
'enable_openssl=yes'.
The original configure script checks openssl header files to generate
config.h even if 'enable_openssl' is not set to yes, this made inconsistent
building for nettle.
Upstream-Status: Pending
Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com>
refactored for 3.4. pending not in as of 3.4
Signed-off-by: Armin Kuster <akuster@mvista.com>
Refactor for 3.10.
Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
---
configure.ac | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index 4f27e663..673c1492 100644
--- a/configure.ac
+++ b/configure.ac
@@ -197,9 +197,11 @@ AC_TYPE_SIZE_T
AC_CHECK_SIZEOF(long)
AC_CHECK_SIZEOF(size_t)
-AC_CHECK_HEADERS([openssl/evp.h openssl/ec.h openssl/rsa.h],,
-[enable_openssl=no
- break])
+if test "x$enable_openssl" = "xyes"; then
+ AC_CHECK_HEADERS([openssl/evp.h openssl/ec.h openssl/rsa.h],,
+ [enable_openssl=no
+ break])
+fi
# For use by the testsuite
AC_CHECK_HEADERS([valgrind/memcheck.h])
--
2.39.2
|
