| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 1 | From ffee6b5f6204a0210f717968ec6ce514d70acca1 Mon Sep 17 00:00:00 2001 |
| 2 | From: Haiqing Bai <Haiqing.Bai@windriver.com> |
| 3 | Date: Fri, 9 Dec 2016 15:23:17 +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 | refactored for 3.4. pending not in as of 3.4 |
| 15 | |
| 16 | Signed-off-by: Armin Kuster <akuster@mvista.com> |
| 17 | |
| 18 | Index: nettle-3.4/configure.ac |
| 19 | =================================================================== |
| 20 | --- nettle-3.4.orig/configure.ac |
| 21 | +++ nettle-3.4/configure.ac |
| 22 | @@ -185,9 +185,11 @@ AC_HEADER_TIME |
| 23 | AC_CHECK_SIZEOF(long) |
| 24 | AC_CHECK_SIZEOF(size_t) |
| 25 | |
| 26 | -AC_CHECK_HEADERS([openssl/evp.h openssl/ecdsa.h],, |
| 27 | -[enable_openssl=no |
| 28 | - break]) |
| 29 | +if test "x$enable_openssl" = "xyes"; then |
| 30 | + AC_CHECK_HEADERS([openssl/evp.h openssl/ecdsa.h],, |
| 31 | + [enable_openssl=no |
| 32 | + break]) |
| 33 | +fi |
| 34 | |
| 35 | # For use by the testsuite |
| 36 | AC_CHECK_HEADERS([valgrind/memcheck.h]) |