Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | Subject: [PATCH] Skip AC_RUN_IFELSE tests |
| 2 | |
| 3 | Upstream-Status: Inappropriate [cross compiling specific] |
| 4 | |
| 5 | Such tests are not supported in a cross compile |
| 6 | environment. Choose sane defaults. |
| 7 | |
| 8 | Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com> |
| 9 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> |
| 10 | --- |
| 11 | acinclude/krb5.m4 | 10 +++++++++- |
| 12 | acinclude/lib-checks.m4 | 8 ++++++-- |
| 13 | 2 files changed, 15 insertions(+), 3 deletions(-) |
| 14 | |
| 15 | diff --git a/acinclude/krb5.m4 b/acinclude/krb5.m4 |
| 16 | index 946bea8..7a072a2 100644 |
| 17 | --- a/acinclude/krb5.m4 |
| 18 | +++ b/acinclude/krb5.m4 |
| 19 | @@ -82,7 +82,15 @@ main(void) |
| 20 | |
| 21 | return 0; |
| 22 | } |
| 23 | -]])], [ squid_cv_broken_heimdal_krb5_h=yes ], [ squid_cv_broken_heimdal_krb5_h=no ]) |
| 24 | +]])], [ squid_cv_broken_heimdal_krb5_h=yes ], [ squid_cv_broken_heimdal_krb5_h=no ], |
| 25 | +[ |
| 26 | + dnl Can't test in cross compiled env - so assume good |
| 27 | + squid_cv_broken_heimdal_krb5_h=no |
| 28 | +]) |
| 29 | + ], |
| 30 | + [ |
| 31 | + dnl Can't test in cross compiled env - so assume good |
| 32 | + squid_cv_broken_heimdal_krb5_h=no |
| 33 | ]) |
| 34 | ]) |
| 35 | ]) dnl SQUID_CHECK_KRB5_HEIMDAL_BROKEN_KRB5_H |
| 36 | diff --git a/acinclude/lib-checks.m4 b/acinclude/lib-checks.m4 |
| 37 | index 2bf98ee..50dba9b 100644 |
| 38 | --- a/acinclude/lib-checks.m4 |
| 39 | +++ b/acinclude/lib-checks.m4 |
| 40 | @@ -128,7 +128,9 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_GETCERTIFICATE_WORKS],[ |
| 41 | AC_DEFINE(SQUID_SSLGETCERTIFICATE_BUGGY, 1) |
| 42 | AC_MSG_RESULT([yes]) |
| 43 | ], |
| 44 | - []) |
| 45 | + [ |
| 46 | + AC_MSG_RESULT([skipped - can't test in cross-compiled env]) |
| 47 | + ]) |
| 48 | |
| 49 | AC_MSG_CHECKING(whether the workaround for SSL_get_certificate works) |
| 50 | AC_RUN_IFELSE([ |
| 51 | @@ -154,7 +156,9 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_GETCERTIFICATE_WORKS],[ |
| 52 | [ |
| 53 | AC_MSG_RESULT([no]) |
| 54 | ], |
| 55 | -[]) |
| 56 | +[ |
| 57 | + AC_MSG_RESULT([skipped - can't test in cross-compiled env]) |
| 58 | +]) |
| 59 | |
| 60 | SQUID_STATE_ROLLBACK(check_SSL_get_certificate) |
| 61 | ]) |
| 62 | -- |
| 63 | 1.7.1 |
| 64 | |