Brad Bishop | c342db3 | 2019-05-15 21:57:59 -0400 | [diff] [blame] | 1 | From e4778299a3e49a634d2c7fe4fd9ac77777e829e3 Mon Sep 17 00:00:00 2001 |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 2 | From: Jim Somerville <Jim.Somerville@windriver.com> |
| 3 | Date: Tue, 14 Oct 2014 02:56:08 -0400 |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 4 | Subject: [PATCH] Skip AC_RUN_IFELSE tests |
| 5 | |
| 6 | Upstream-Status: Inappropriate [cross compiling specific] |
| 7 | |
| 8 | Such tests are not supported in a cross compile |
| 9 | environment. Choose sane defaults. |
| 10 | |
| 11 | Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com> |
| 12 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 13 | |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 14 | --- |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 15 | acinclude/krb5.m4 | 10 +++++++++- |
| 16 | acinclude/lib-checks.m4 | 8 ++++++-- |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 17 | 2 files changed, 15 insertions(+), 3 deletions(-) |
| 18 | |
| 19 | diff --git a/acinclude/krb5.m4 b/acinclude/krb5.m4 |
Brad Bishop | c342db3 | 2019-05-15 21:57:59 -0400 | [diff] [blame] | 20 | index ad0ba60..4477446 100644 |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 21 | --- a/acinclude/krb5.m4 |
| 22 | +++ b/acinclude/krb5.m4 |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 23 | @@ -61,7 +61,15 @@ main(void) |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 24 | |
| 25 | return 0; |
| 26 | } |
| 27 | -]])], [ squid_cv_broken_heimdal_krb5_h=yes ], [ squid_cv_broken_heimdal_krb5_h=no ]) |
| 28 | +]])], [ squid_cv_broken_heimdal_krb5_h=yes ], [ squid_cv_broken_heimdal_krb5_h=no ], |
| 29 | +[ |
| 30 | + dnl Can't test in cross compiled env - so assume good |
| 31 | + squid_cv_broken_heimdal_krb5_h=no |
| 32 | +]) |
| 33 | + ], |
| 34 | + [ |
| 35 | + dnl Can't test in cross compiled env - so assume good |
| 36 | + squid_cv_broken_heimdal_krb5_h=no |
| 37 | ]) |
| 38 | ]) |
| 39 | ]) dnl SQUID_CHECK_KRB5_HEIMDAL_BROKEN_KRB5_H |
| 40 | diff --git a/acinclude/lib-checks.m4 b/acinclude/lib-checks.m4 |
Andrew Geissler | 87f5cff | 2022-09-30 13:13:31 -0500 | [diff] [blame^] | 41 | index 1e9333527c..2d42787029 100644 |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 42 | --- a/acinclude/lib-checks.m4 |
| 43 | +++ b/acinclude/lib-checks.m4 |
Andrew Geissler | 87f5cff | 2022-09-30 13:13:31 -0500 | [diff] [blame^] | 44 | @@ -227,7 +227,9 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_CONST_SSL_METHOD],[ |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 45 | [ |
| 46 | AC_MSG_RESULT([no]) |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 47 | ], |
| 48 | - []) |
| 49 | + [ |
| 50 | + AC_MSG_RESULT([skipped - can't test in cross-compiled env]) |
| 51 | + ]) |
| 52 | |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 53 | SQUID_STATE_ROLLBACK(check_const_SSL_METHOD) |
Brad Bishop | c342db3 | 2019-05-15 21:57:59 -0400 | [diff] [blame] | 54 | ]) |
Andrew Geissler | 87f5cff | 2022-09-30 13:13:31 -0500 | [diff] [blame^] | 55 | @@ -386,8 +386,9 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_TXTDB],[ |
| 56 | [ |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 57 | AC_MSG_RESULT([yes]) |
| 58 | AC_DEFINE(SQUID_USE_SSLLHASH_HACK, 1) |
Andrew Geissler | 87f5cff | 2022-09-30 13:13:31 -0500 | [diff] [blame^] | 59 | - ], |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 60 | -[]) |
Andrew Geissler | 87f5cff | 2022-09-30 13:13:31 -0500 | [diff] [blame^] | 61 | + ],[ |
| 62 | + AC_MSG_RESULT([skipped - can't test in cross-compiled env]) |
| 63 | + ]) |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 64 | |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 65 | SQUID_STATE_ROLLBACK(check_TXTDB) |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 66 | ]) |