1From 050f8ab275a7a5f3d94045da6b15a2b63dfbeb3f 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
19--- a/acinclude/krb5.m4
20+++ b/acinclude/krb5.m4
21@@ -57,7 +57,15 @@ main(void)
22
23         return 0;
24 }
25-]])], [ squid_cv_broken_heimdal_krb5_h=yes ], [ squid_cv_broken_heimdal_krb5_h=no ])
26+]])], [ squid_cv_broken_heimdal_krb5_h=yes ], [ squid_cv_broken_heimdal_krb5_h=no ],
27+[
28+  dnl Can't test in cross compiled env - so assume good
29+  squid_cv_broken_heimdal_krb5_h=no
30+])
31+    ],
32+    [
33+     dnl Can't test in cross compiled env - so assume good
34+     squid_cv_broken_heimdal_krb5_h=no
35     ])
36     SQUID_STATE_ROLLBACK(squid_krb5_heimdal_test)
37   ])
38--- a/acinclude/lib-checks.m4
39+++ b/acinclude/lib-checks.m4
40@@ -205,7 +205,9 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_CONST_SSL_
41   [
42    AC_MSG_RESULT([no])
43   ],
44-  [])
45+  [
46+   AC_MSG_RESULT([skipped - can't test in cross-compiled env])
47+  ])
48
49 SQUID_STATE_ROLLBACK(check_const_SSL_METHOD)
50 ])
51@@ -347,7 +349,9 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_TXTDB],[
52   ],[
53     AC_MSG_RESULT([yes])
54     AC_DEFINE(SQUID_USE_SSLLHASH_HACK, 1)
55-  ],[])
56+  ],[
57+    AC_MSG_RESULT([skipped - can't test in cross-compiled env])
58+  ])
59
60   SQUID_STATE_ROLLBACK(check_TXTDB)
61 ])
62