patch-configure 5.8 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207
  1. --- squid-3.3.9.orig/configure 2013-09-11 06:09:44.000000000 +0200
  2. +++ squid-3.3.9/configure 2013-10-05 21:38:15.000000000 +0200
  3. @@ -18948,52 +18948,9 @@ unset squid_tmp_define
  4. # to be used by sub-commands
  5. export enable_inline
  6. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU atomic operations support" >&5
  7. -$as_echo_n "checking for GNU atomic operations support... " >&6; }
  8. -if test "$cross_compiling" = yes; then :
  9. - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  10. -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  11. -as_fn_error $? "cannot run test program while cross compiling
  12. -See \`config.log' for more details" "$LINENO" 5; }
  13. -else
  14. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  15. -/* end confdefs.h. */
  16. -
  17. - int n = 0;
  18. -
  19. -int
  20. -main ()
  21. -{
  22. -
  23. - __sync_add_and_fetch(&n, 10); // n becomes 10
  24. - __sync_fetch_and_add(&n, 20); // n becomes 30
  25. - __sync_sub_and_fetch(&n, 15); // n becomes 15
  26. - __sync_bool_compare_and_swap(&n, 15, 201); // n becomes 201
  27. - __sync_fetch_and_and(&n, 200); // n becomes 200
  28. - return (n == 200) ? 0 : -1;
  29. -
  30. - ;
  31. - return 0;
  32. -}
  33. -_ACEOF
  34. -if ac_fn_cxx_try_run "$LINENO"; then :
  35. -
  36. $as_echo "#define HAVE_ATOMIC_OPS 1" >>confdefs.h
  37. - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  38. -$as_echo "yes" >&6; }
  39. -
  40. -else
  41. -
  42. - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  43. -$as_echo "no" >&6; }
  44. -
  45. -fi
  46. -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
  47. - conftest.$ac_objext conftest.beam conftest.$ac_ext
  48. -fi
  49. -
  50. # Check whether --enable-debug-cbdata was given.
  51. @@ -21049,151 +21006,6 @@ if test "x$with_openssl" = "xyes"; then
  52. -# save state, key is check_SSL_get_certificate
  53. -check_SSL_get_certificate_CFLAGS="${CFLAGS}"
  54. -check_SSL_get_certificate_CXXFLAGS="${CXXFLAGS}"
  55. -check_SSL_get_certificate_LDFLAGS="${LDFLAGS}"
  56. -check_SSL_get_certificate_LIBS="${LIBS}"
  57. -check_SSL_get_certificate_CC="${CC}"
  58. -check_SSL_get_certificate_CXX="${CXX}"
  59. -check_SSL_get_certificate_squid_saved_vars=""
  60. -for squid_util_var_tosave in $check_SSL_get_certificate_squid_saved_vars
  61. -do
  62. - squid_util_var_tosave2="check_SSL_get_certificate_${squid_util_var_tosave}"
  63. - eval "${squid_util_var_tosave2}=\"${squid_util_var_tosave}\""
  64. -done
  65. -
  66. - LIBS="$SSLLIB $LIBS"
  67. - if test "x$SSLLIBDIR" != "x"; then
  68. - LIBS="$LIBS -Wl,-rpath -Wl,$SSLLIBDIR"
  69. - fi
  70. -
  71. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the SSL_get_certificate is buggy" >&5
  72. -$as_echo_n "checking whether the SSL_get_certificate is buggy... " >&6; }
  73. - if test "$cross_compiling" = yes; then :
  74. - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  75. -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  76. -as_fn_error $? "cannot run test program while cross compiling
  77. -See \`config.log' for more details" "$LINENO" 5; }
  78. -else
  79. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  80. -/* end confdefs.h. */
  81. -
  82. -
  83. - #include <openssl/ssl.h>
  84. - #include <openssl/err.h>
  85. -
  86. -int
  87. -main ()
  88. -{
  89. -
  90. - SSLeay_add_ssl_algorithms();
  91. - SSL_CTX *sslContext = SSL_CTX_new(SSLv3_method());
  92. - SSL *ssl = SSL_new(sslContext);
  93. - X509* cert = SSL_get_certificate(ssl);
  94. - return 0;
  95. -
  96. - ;
  97. - return 0;
  98. -}
  99. -
  100. -_ACEOF
  101. -if ac_fn_cxx_try_run "$LINENO"; then :
  102. -
  103. - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  104. -$as_echo "no" >&6; }
  105. -
  106. -else
  107. -
  108. - $as_echo "#define SQUID_SSLGETCERTIFICATE_BUGGY 1" >>confdefs.h
  109. -
  110. - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  111. -$as_echo "yes" >&6; }
  112. -
  113. -fi
  114. -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
  115. - conftest.$ac_objext conftest.beam conftest.$ac_ext
  116. -fi
  117. -
  118. -
  119. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the workaround for SSL_get_certificate works" >&5
  120. -$as_echo_n "checking whether the workaround for SSL_get_certificate works... " >&6; }
  121. - if test "$cross_compiling" = yes; then :
  122. - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  123. -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  124. -as_fn_error $? "cannot run test program while cross compiling
  125. -See \`config.log' for more details" "$LINENO" 5; }
  126. -else
  127. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  128. -/* end confdefs.h. */
  129. -
  130. -
  131. - #include <openssl/ssl.h>
  132. - #include <openssl/err.h>
  133. -
  134. -int
  135. -main ()
  136. -{
  137. -
  138. - SSLeay_add_ssl_algorithms();
  139. - SSL_CTX *sslContext = SSL_CTX_new(SSLv3_method());
  140. - X509 ***pCert = (X509 ***)sslContext->cert;
  141. - X509 *sslCtxCert = pCert && *pCert ? **pCert : (X509 *)0x1;
  142. - if (sslCtxCert != NULL)
  143. - return 1;
  144. - return 0;
  145. -
  146. - ;
  147. - return 0;
  148. -}
  149. -
  150. -_ACEOF
  151. -if ac_fn_cxx_try_run "$LINENO"; then :
  152. -
  153. - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  154. -$as_echo "yes" >&6; }
  155. - $as_echo "#define SQUID_USE_SSLGETCERTIFICATE_HACK 1" >>confdefs.h
  156. -
  157. -
  158. -else
  159. -
  160. - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  161. -$as_echo "no" >&6; }
  162. -
  163. -fi
  164. -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
  165. - conftest.$ac_objext conftest.beam conftest.$ac_ext
  166. -fi
  167. -
  168. -
  169. -
  170. -# rollback state, key is check_SSL_get_certificate
  171. -CFLAGS="${check_SSL_get_certificate_CFLAGS}"
  172. -CXXFLAGS="${check_SSL_get_certificate_CXXFLAGS}"
  173. -LDFLAGS="${check_SSL_get_certificate_LDFLAGS}"
  174. -LIBS="${check_SSL_get_certificate_LIBS}"
  175. -CC="${check_SSL_get_certificate_CC}"
  176. -CXX="${check_SSL_get_certificate_CXX}"
  177. -for squid_util_var_tosave in $check_SSL_get_certificate_squid_saved_vars
  178. -do
  179. - squid_util_var_tosave2="\$check_SSL_get_certificate_${squid_util_var_tosave}"
  180. - eval "$squid_util_var_tosave=\"${squid_util_var_tosave2}\""
  181. -done
  182. -
  183. -# commit state, key is check_SSL_get_certificate
  184. -unset check_SSL_get_certificate_CFLAGS
  185. -unset check_SSL_get_certificate_CXXFLAGS
  186. -unset check_SSL_get_certificate_LDFLAGS
  187. -unset check_SSL_get_certificate_LIBS
  188. -unset check_SSL_get_certificate_CC
  189. -unset check_SSL_get_certificate_CXX
  190. -for squid_util_var_tosave in $check_SSL_get_certificate_squid_saved_vars
  191. -do
  192. - unset ${squid_util_var_tosave}
  193. -done
  194. -
  195. -
  196. -