| 1 |
vapier 11/12/01 02:04:41 |
| 2 |
|
| 3 |
Added: wget-1.13.4-openssl-pkg-config.patch |
| 4 |
Log: |
| 5 |
Switch to pkg-config for looking up openssl #246556 by Rick Farina. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha75/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-misc/wget/files/wget-1.13.4-openssl-pkg-config.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wget/files/wget-1.13.4-openssl-pkg-config.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/wget/files/wget-1.13.4-openssl-pkg-config.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: wget-1.13.4-openssl-pkg-config.patch |
| 16 |
=================================================================== |
| 17 |
detect openssl via pkg-config if it's available |
| 18 |
|
| 19 |
--- a/configure.ac |
| 20 |
+++ b/configure.ac |
| 21 |
@@ -234,7 +234,16 @@ dnl |
| 22 |
dnl Checks for libraries. |
| 23 |
dnl |
| 24 |
|
| 25 |
+PKG_PROG_PKG_CONFIG |
| 26 |
+ |
| 27 |
AS_IF([test x"$with_ssl" = xopenssl], [ |
| 28 |
+ PKG_CHECK_MODULES([OPENSSL], [openssl], [ |
| 29 |
+ AC_MSG_NOTICE([compiling in support for SSL via OpenSSL]) |
| 30 |
+ AC_LIBOBJ([openssl]) |
| 31 |
+ LIBS="$OPENSSL_LIBS $LIBS" |
| 32 |
+ CFLAGS="$OPENSSL_CFLAGS -DHAVE_LIBSSL $CFLAGS" |
| 33 |
+ ], [ |
| 34 |
+ |
| 35 |
dnl some versions of openssl use zlib compression |
| 36 |
AC_CHECK_LIB(z, compress) |
| 37 |
|
| 38 |
@@ -294,6 +303,8 @@ AS_IF([test x$ssl_found != xyes], |
| 39 |
|
| 40 |
]) |
| 41 |
|
| 42 |
+]) |
| 43 |
+ |
| 44 |
], [ |
| 45 |
# --with-ssl is not gnutls: check if it's no |
| 46 |
AS_IF([test x"$with_ssl" != xno], [ |
Archives