diff options
| author | fredb <fredb@pkgsrc.org> | 2001-04-20 12:33:52 +0000 |
|---|---|---|
| committer | fredb <fredb@pkgsrc.org> | 2001-04-20 12:33:52 +0000 |
| commit | fc188fc5fc5b97a1b6206cf755047bd8477db121 (patch) | |
| tree | 897dc4c4634be8f172fc6d28529976d1b62de921 /www/libwww/Makefile | |
| parent | aa3c03b75aef46d8f0bbe58ddc94e35a6ad632a4 (diff) | |
| download | pkgsrc-fc188fc5fc5b97a1b6206cf755047bd8477db121.tar.gz | |
Rely on the fact that shared libraries can encode run-time dependencies
on other libraries, on both ELF and (NetBSD/)a.out, to make
libwwwssl.so.?.? depend on the correct openssl shared libraries, as
determined by the setting of ${SSLBASE} in bsd.pkg.mk. This closes PR
pkg/12570, and has the additional advantage that programs that _do_ _not_
need to link in "-lwwwssl" won't get "-lssl" or "-lcrypto" at all.
Also, make"w3c" and "www" build again with USE_SOCKS=4.
Diffstat (limited to 'www/libwww/Makefile')
| -rw-r--r-- | www/libwww/Makefile | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/www/libwww/Makefile b/www/libwww/Makefile index 916f1f24902..787b012b307 100644 --- a/www/libwww/Makefile +++ b/www/libwww/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2001/03/27 03:20:23 hubertf Exp $ +# $NetBSD: Makefile,v 1.22 2001/04/20 12:33:52 fredb Exp $ # FreeBSD Id: Makefile,v 1.10 1998/06/14 23:34:59 jseger Exp # @@ -12,6 +12,8 @@ MAINTAINER= tv@netbsd.org HOMEPAGE= http://www.w3.org/Library/ COMMENT= The W3C Reference Library +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf +BUILD_DEPENDS+= automake-1.4:../../devel/automake BUILD_DEPENDS+= perl-5.*:../../lang/perl5 USE_GMAKE= yes @@ -20,29 +22,33 @@ USE_SSL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-zlib --with-regex --without-x -CONFIGURE_ARGS+= --with-ssl +CONFIGURE_ARGS+= --with-ssl="${SSLBASE}" DOCDIR= ${PREFIX}/share/doc/libwww LTCONFIG_OVERRIDE= ${WRKSRC}/config/ltconfig pre-configure: cd ${WRKSRC}; \ - for foo in configure.in aclocal.m4 `find . -name Makefile.in` \ - configure stamp-h.in; do \ - ${TOUCH} $$foo; \ - done + ${LOCALBASE}/bin/aclocal && \ + ${LOCALBASE}/bin/automake && \ + ${LOCALBASE}/bin/autoconf .include "../../mk/bsd.prefs.mk" # Include SOCKS firewall support .if defined(USE_SOCKS) && (${USE_SOCKS} == 4 || ${USE_SOCKS} == 5) .if ${USE_SOCKS} == 4 -CONFIGURE_ARGS+= --with-socks --with-socks4 --without-socks5 +CONFIGURE_ARGS+= --with-socks4=${LOCALBASE}/lib/libsocks4.a --with-socks5=no DEPENDS+= socks4-2.2:../../net/socks4 .else -CONFIGURE_ARGS+= --with-socks --without-socks4 --with-socks5 +CONFIGURE_ARGS+= --with-socks5=${LOCALBASE}/lib/libsocks5.a --with-socks4=no DEPENDS+= socks5-1.0.2:../../net/socks5 .endif .endif .include "../../mk/bsd.pkg.mk" + +# This has to come after bsd.pkg.mk's construction of "${CONFIGURE_ENV}" +# in order to have the desired effect. It's purpose is to allow "${SSLBASE}" +# to take control of which "openssl" is used, if several are installed. +CONFIGURE_ENV+= LDFLAGS="" |