| rjw | 1f88458 | 2022-01-06 17:20:42 +0800 | [diff] [blame^] | 1 | From 95c6efc308c314f0cfe874d6a26cd1f59089adf6 Mon Sep 17 00:00:00 2001 |
| 2 | From: Haiqing Bai <Haiqing.Bai@windriver.com> |
| 3 | Date: Fri, 9 Dec 2016 16:16:45 +0800 |
| 4 | Subject: [PATCH] nettle: check header files of openssl only if |
| 5 | 'enable_openssl=yes'. |
| 6 | |
| 7 | The original configure script checks openssl header files to generate |
| 8 | config.h even if 'enable_openssl' is not set to yes, this made inconsistent |
| 9 | building for nettle. |
| 10 | |
| 11 | Upstream-Status: Pending |
| 12 | Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com> |
| 13 | |
| 14 | --- |
| 15 | configure.ac | 8 +++++--- |
| 16 | 1 file changed, 5 insertions(+), 3 deletions(-) |
| 17 | |
| 18 | diff --git a/configure.ac b/configure.ac |
| 19 | index 78a3d4e..4f16a98 100644 |
| 20 | --- a/configure.ac |
| 21 | +++ b/configure.ac |
| 22 | @@ -603,9 +603,11 @@ AC_CHECK_ALIGNOF(uint64_t) |
| 23 | ALIGNOF_UINT64_T="$ac_cv_alignof_uint64_t" |
| 24 | AC_SUBST(ALIGNOF_UINT64_T) |
| 25 | |
| 26 | -AC_CHECK_HEADERS([openssl/blowfish.h openssl/des.h openssl/cast.h openssl/aes.h],, |
| 27 | -[enable_openssl=no |
| 28 | - break]) |
| 29 | +if test "x$enable_openssl" = "xyes"; then |
| 30 | + AC_CHECK_HEADERS([openssl/blowfish.h openssl/des.h openssl/cast.h openssl/aes.h],, |
| 31 | + [enable_openssl=no |
| 32 | + break]) |
| 33 | +fi |
| 34 | |
| 35 | LSH_FUNC_ALLOCA |
| 36 | LSH_FUNC_STRERROR |