]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Fix cross-compile issues with SSL_get_certificate()
authorAmos Jeffries <squid3@treenet.co.nz>
Wed, 8 Apr 2015 05:27:24 +0000 (22:27 -0700)
committerAmos Jeffries <squid3@treenet.co.nz>
Wed, 8 Apr 2015 05:27:24 +0000 (22:27 -0700)
Explicitly assume 'no' to these hacks when cross-compiling and create
the autoconf.h #define.

Thanks to Cambier GaĆ«tan for identifying the problem.

acinclude/lib-checks.m4

index d1f2d2e946204ce5927c53a4dc2d4e459378ec78..57932b1fb627c33ad583286b3582ccdd63f1e2c4 100644 (file)
@@ -106,7 +106,10 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_GETCERTIFICATE_WORKS],[
    AC_DEFINE(SQUID_SSLGETCERTIFICATE_BUGGY, 1)
    AC_MSG_RESULT([yes])
   ],
-  [])
+  [
+   AC_DEFINE(SQUID_SSLGETCERTIFICATE_BUGGY, 0)
+   AC_MSG_RESULT([cross-compile, assuming no])
+  ])
 
   AC_MSG_CHECKING(whether the workaround for SSL_get_certificate works)
   AC_RUN_IFELSE([
@@ -132,7 +135,10 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_GETCERTIFICATE_WORKS],[
   [
    AC_MSG_RESULT([no])
   ],
-[])
+  [
+   AC_DEFINE(SQUID_USE_SSLGETCERTIFICATE_HACK, 0)
+   AC_MSG_RESULT([cross-compile, assuming no])
+  ])
 
 SQUID_STATE_ROLLBACK(check_SSL_get_certificate)
 ])