Ignore version checks if cross compiling. Fixes #1340.

Avoiding checks is a bad idea, but we don't really have any
option when cross compiling

diff --git a/configure b/configure
index b0da4dc199f405898c1b447eb4a28fa9e8c3196e..567245c15c8211eade37f2bcafeb798c4b3a329b 100755 (executable)
--- a/configure
+++ b/configure
@@ -8734,10 +8734,11 @@ rm -f conftest*
                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenSSL library and header version consistency" >&5
 $as_echo_n "checking OpenSSL library and header version consistency... " >&6; }
     if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: cross-compiling (assuming yes)" >&5
+$as_echo "cross-compiling (assuming yes)" >&6; }
+
+
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -8776,7 +8777,6 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "OpenSSL library version does not match header version
 See \`config.log' for more details" "$LINENO" 5; }
 
-
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext

diff --git a/configure.ac b/configure.ac
index f7887d25307d0e966f753b16ef0babe4e9c295a6..23eeb7faf3cf8488181e9d13a4faf4a70bbb4d03 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1172,6 +1172,9 @@ if test "x$WITH_OPENSSL" = xyes; then
       [
         AC_MSG_RESULT(no)
         AC_MSG_FAILURE([OpenSSL library version does not match header version])
+      ],
+      [
+        AC_MSG_RESULT([cross-compiling (assuming yes)])
       ]
     )
     CPPFLAGS="$old_CPPFLAGS"