------------------------------------------------------------ revno: 13791 revision-id: squid3@treenet.co.nz-20150409020831-najhozzj9qc0oj7q parent: squid3@treenet.co.nz-20150409020717-asle57l7u19pknxh committer: Amos Jeffries branch nick: 3.5 timestamp: Wed 2015-04-08 19:08:31 -0700 message: Fix cross-compile issues with SSL_get_certificate() Explicitly assume 'no' to these hacks when cross-compiling and create the autoconf.h #define. Thanks to Cambier Gaëtan for identifying the problem. ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20150409020831-najhozzj9qc0oj7q # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # testament_sha1: e4daaec628366525b1771074c734ef19c3fde454 # timestamp: 2015-04-09 02:16:45 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # base_revision_id: squid3@treenet.co.nz-20150409020717-\ # asle57l7u19pknxh # # Begin patch === modified file 'acinclude/lib-checks.m4' --- acinclude/lib-checks.m4 2015-01-13 09:13:49 +0000 +++ acinclude/lib-checks.m4 2015-04-09 02:08:31 +0000 @@ -106,7 +106,10 @@ 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_MSG_RESULT([no]) ], -[]) + [ + AC_DEFINE(SQUID_USE_SSLGETCERTIFICATE_HACK, 0) + AC_MSG_RESULT([cross-compile, assuming no]) + ]) SQUID_STATE_ROLLBACK(check_SSL_get_certificate) ])