blob: d72165a6e7d4fc961d399cfaa52118516310b18d (
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
|
From 95c6efc308c314f0cfe874d6a26cd1f59089adf6 Mon Sep 17 00:00:00 2001
From: Haiqing Bai <Haiqing.Bai@windriver.com>
Date: Fri, 9 Dec 2016 16:16:45 +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>
---
configure.ac | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index 78a3d4e..4f16a98 100644
--- a/configure.ac
+++ b/configure.ac
@@ -603,9 +603,11 @@ AC_CHECK_ALIGNOF(uint64_t)
ALIGNOF_UINT64_T="$ac_cv_alignof_uint64_t"
AC_SUBST(ALIGNOF_UINT64_T)
-AC_CHECK_HEADERS([openssl/blowfish.h openssl/des.h openssl/cast.h openssl/aes.h],,
-[enable_openssl=no
- break])
+if test "x$enable_openssl" = "xyes"; then
+ AC_CHECK_HEADERS([openssl/blowfish.h openssl/des.h openssl/cast.h openssl/aes.h],,
+ [enable_openssl=no
+ break])
+fi
LSH_FUNC_ALLOCA
LSH_FUNC_STRERROR
|
