]>
Commit | Line | Data |
---|---|---|
1 | ------------------------------------------------------------ | |
2 | revno: 14054 | |
3 | revision-id: squid3@treenet.co.nz-20160521130144-6xtcayieij00fm5v | |
4 | parent: squid3@treenet.co.nz-20160521130058-zq8zugw0fohwfu3z | |
5 | committer: Amos Jeffries <squid3@treenet.co.nz> | |
6 | branch nick: 3.5 | |
7 | timestamp: Sun 2016-05-22 01:01:44 +1200 | |
8 | message: | |
9 | Fix OpenSSL detection on FreeBSD | |
10 | ------------------------------------------------------------ | |
11 | # Bazaar merge directive format 2 (Bazaar 0.90) | |
12 | # revision_id: squid3@treenet.co.nz-20160521130144-6xtcayieij00fm5v | |
13 | # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 | |
14 | # testament_sha1: 3d8c0d7a9f1886523ac55d79e4d3e8f0340e2ec9 | |
15 | # timestamp: 2016-05-21 13:08:08 +0000 | |
16 | # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 | |
17 | # base_revision_id: squid3@treenet.co.nz-20160521130058-\ | |
18 | # zq8zugw0fohwfu3z | |
19 | # | |
20 | # Begin patch | |
21 | === modified file 'configure.ac' | |
22 | --- configure.ac 2016-05-21 13:00:58 +0000 | |
23 | +++ configure.ac 2016-05-21 13:01:44 +0000 | |
24 | @@ -1348,10 +1348,10 @@ | |
25 | ||
26 | AC_CHECK_LIB(crypto,[CRYPTO_new_ex_data],[LIBOPENSSL_LIBS="-lcrypto $LIBOPENSSL_LIBS"],[ | |
27 | AC_MSG_ERROR([library 'crypto' is required for OpenSSL]) | |
28 | - ]) | |
29 | + ],$LIBOPENSSL_LIBS) | |
30 | AC_CHECK_LIB(ssl,[SSL_library_init],[LIBOPENSSL_LIBS="-lssl $LIBOPENSSL_LIBS"],[ | |
31 | AC_MSG_ERROR([library 'ssl' is required for OpenSSL]) | |
32 | - ]) | |
33 | + ],$LIBOPENSSL_LIBS) | |
34 | ]) | |
35 | ||
36 | # This is a workaround for RedHat 9 brain damage.. | |
37 |