1From e4778299a3e49a634d2c7fe4fd9ac77777e829e3 Mon Sep 17 00:00:00 2001
2From: Jim Somerville <Jim.Somerville@windriver.com>
3Date: Tue, 14 Oct 2014 02:56:08 -0400
4Subject: [PATCH] Skip AC_RUN_IFELSE tests
5
6Upstream-Status: Inappropriate [cross compiling specific]
7
8Such tests are not supported in a cross compile
9environment.  Choose sane defaults.
10
11Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
12Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
13
14---
15 acinclude/krb5.m4       | 10 +++++++++-
16 acinclude/lib-checks.m4 |  8 ++++++--
17 2 files changed, 15 insertions(+), 3 deletions(-)
18
19diff --git a/acinclude/krb5.m4 b/acinclude/krb5.m4
20index ad0ba60..4477446 100644
21--- a/acinclude/krb5.m4
22+++ b/acinclude/krb5.m4
23@@ -61,7 +61,15 @@ main(void)
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
40diff --git a/acinclude/lib-checks.m4 b/acinclude/lib-checks.m4
41index 7624b56..b449c5a 100644
42--- a/acinclude/lib-checks.m4
43+++ b/acinclude/lib-checks.m4
44@@ -217,7 +217,9 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_CONST_SSL_METHOD],[
45   [
46    AC_MSG_RESULT([no])
47   ],
48-  [])
49+  [
50+   AC_MSG_RESULT([skipped - can't test in cross-compiled env])
51+  ])
52
53 SQUID_STATE_ROLLBACK(check_const_SSL_METHOD)
54 ])
55@@ -377,7 +379,9 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_TXTDB],[
56    AC_MSG_RESULT([yes])
57    AC_DEFINE(SQUID_USE_SSLLHASH_HACK, 1)
58   ],
59-[])
60+[
61+   AC_MSG_RESULT([skipped - can't test in cross-compiled env])
62+])
63
64 SQUID_STATE_ROLLBACK(check_TXTDB)
65 ])
66