Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 1 | From 03fe7efa1bc04a83fb9b6787998e7baa7ee90646 Mon Sep 17 00:00:00 2001 |
| 2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> |
| 3 | Date: Mon, 22 Oct 2018 15:27:41 +0800 |
| 4 | Subject: [PATCH 3/4] Fix underquoted m4 entry. This causes a failure if gcrypt |
| 5 | isn't present: |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 6 | |
| 7 | | configure: libgcrypt support disabled |
| 8 | | ../rng-tools-5/configure: line 4345: ac_fn_c_try_link: command not found |
| 9 | | configure: error: in `/media/build1/poky/build/tmp/work/i586-poky-linux/rng-tools/5-r0/build': |
| 10 | |
| 11 | RP |
| 12 | 2016/2/16 |
| 13 | |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 14 | Upstream-Status: Pending |
| 15 | |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 16 | Rebase to 6.6 |
| 17 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 18 | --- |
| 19 | configure.ac | 4 ++-- |
| 20 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 21 | |
| 22 | diff --git a/configure.ac b/configure.ac |
| 23 | index dd1c30f..88d2be3 100644 |
| 24 | --- a/configure.ac |
| 25 | +++ b/configure.ac |
| 26 | @@ -124,7 +124,7 @@ AS_IF( |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 27 | [test "x$with_libgcrypt" != "xno"], |
| 28 | [ |
| 29 | AC_CHECK_HEADER([gcrypt.h], |
| 30 | - AC_CHECK_LIB( |
| 31 | + [AC_CHECK_LIB( |
| 32 | [gcrypt], |
| 33 | [gcry_check_version], , |
| 34 | [ |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 35 | @@ -133,7 +133,7 @@ AS_IF( |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 36 | AC_MSG_NOTICE([libgcrypt support disabled]) |
| 37 | fi |
| 38 | ] |
| 39 | - ), |
| 40 | + )], |
| 41 | [if test "x$with_libgcrypt" != "xcheck"; then |
| 42 | AC_MSG_FAILURE([libgcrypt headers not found]); else |
| 43 | AC_MSG_NOTICE([libgcrypt support disabled]) |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 44 | -- |
| 45 | 2.7.4 |
| 46 | |