forked from brl/citadel
37 lines
1.1 KiB
Diff
37 lines
1.1 KiB
Diff
|
From ffee6b5f6204a0210f717968ec6ce514d70acca1 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>
|
||
|
|
|
||
|
|
Index: nettle-3.4/configure.ac
|
||
|
|
===================================================================
|
||
|
|
--- nettle-3.4.orig/configure.ac
|
||
|
|
+++ nettle-3.4/configure.ac
|
||
|
|
@@ -185,9 +185,11 @@ AC_HEADER_TIME
|
||
|
|
AC_CHECK_SIZEOF(long)
|
||
|
|
AC_CHECK_SIZEOF(size_t)
|
||
|
|
|
||
|
|
-AC_CHECK_HEADERS([openssl/evp.h openssl/ecdsa.h],,
|
||
|
|
-[enable_openssl=no
|
||
|
|
- break])
|
||
|
|
+if test "x$enable_openssl" = "xyes"; then
|
||
|
|
+ AC_CHECK_HEADERS([openssl/evp.h openssl/ecdsa.h],,
|
||
|
|
+ [enable_openssl=no
|
||
|
|
+ break])
|
||
|
|
+fi
|
||
|
|
|
||
|
|
# For use by the testsuite
|
||
|
|
AC_CHECK_HEADERS([valgrind/memcheck.h])
|