summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMamoru Komachi <usata@gentoo.org>2004-03-12 16:34:55 +0000
committerMamoru Komachi <usata@gentoo.org>2004-03-12 16:34:55 +0000
commit59808cff774f21e32306fca86bce0402a7ec0120 (patch)
treee7ed0b91d1dc21f0b14407d9d8a817e02dd0f6d0 /net-libs/libwww
parentSmall update to postinst message. (Manifest recommit) (diff)
downloadgentoo-2-59808cff774f21e32306fca86bce0402a7ec0120.tar.gz
gentoo-2-59808cff774f21e32306fca86bce0402a7ec0120.tar.bz2
gentoo-2-59808cff774f21e32306fca86bce0402a7ec0120.zip
Fixed compile error when stratego is installed. See bug #44037
Diffstat (limited to 'net-libs/libwww')
-rw-r--r--net-libs/libwww/ChangeLog6
-rw-r--r--net-libs/libwww/files/libwww-5.4.0-autoconf-gentoo.diff33
-rw-r--r--net-libs/libwww/libwww-5.4.0-r2.ebuild3
3 files changed, 40 insertions, 2 deletions
diff --git a/net-libs/libwww/ChangeLog b/net-libs/libwww/ChangeLog
index 23ccc38d3b46..c7993ab3d929 100644
--- a/net-libs/libwww/ChangeLog
+++ b/net-libs/libwww/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-libs/libwww
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/ChangeLog,v 1.23 2004/03/09 23:32:24 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/ChangeLog,v 1.24 2004/03/12 16:34:55 usata Exp $
+
+ 13 Mar 2004; Mamoru KOMACHI <usata@gentoo.org> libwww-5.4.0-r2.ebuild,
+ files/libwww-5.4.0-autoconf-gentoo.diff:
+ Fixed compile error when stratego is installed. See bug #44037
09 Mar 2004; <agriffis@gentoo.org> libwww-5.4.0-r2.ebuild:
stable on alpha and ia64
diff --git a/net-libs/libwww/files/libwww-5.4.0-autoconf-gentoo.diff b/net-libs/libwww/files/libwww-5.4.0-autoconf-gentoo.diff
new file mode 100644
index 000000000000..38b08d6a9468
--- /dev/null
+++ b/net-libs/libwww/files/libwww-5.4.0-autoconf-gentoo.diff
@@ -0,0 +1,33 @@
+diff -urN w3c-libwww-5.4.0.ORIG/configure.ac w3c-libwww-5.4.0/configure.ac
+--- w3c-libwww-5.4.0.ORIG/configure.ac 2004-03-13 00:45:36.985124000 +0900
++++ w3c-libwww-5.4.0/configure.ac 2004-03-13 00:49:13.225250888 +0900
+@@ -623,19 +623,16 @@
+ ssllib="-L/usr/lib -lssl -lcrypto"
+ fi
+ dnl find the ssl include dir (empirical)
+-if test -d '/usr/local/ssl/include'; then
+- sslinc="-I/usr/local/ssl/include"
+-elif test -d '/usr/local/openssl/include'; then
+- sslinc="-I/usr/local/openssl/include"
+-elif test -d '/usr/local/include/openssl'; then
+- sslinc="-I/usr/local/include/openssl"
+-elif test -d '/usr/include/ssl'; then
+- sslinc="-I/usr/include/ssl"
+-elif test -d '/usr/include/openssl'; then
+- sslinc="-I/usr/include/openssl"
+-else
+- sslinc=""
+-fi
++ssldir=""
++for ssldir in /usr/local/ssl/include \
++ /usr/local/openssl/include \
++ /usr/local/include/openssl \
++ /usr/include/ssl \
++ /usr/include/openssl ; do
++ if test -d $ssldir -a -f $ssldir/ssl.h ; then
++ sslinc="-I$ssldir"
++ fi
++done
+ WWWSSL=""
+ SSLINC=""
+ LIBSSL=""
diff --git a/net-libs/libwww/libwww-5.4.0-r2.ebuild b/net-libs/libwww/libwww-5.4.0-r2.ebuild
index d279afe76c05..bd20d1fc1d99 100644
--- a/net-libs/libwww/libwww-5.4.0-r2.ebuild
+++ b/net-libs/libwww/libwww-5.4.0-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/libwww-5.4.0-r2.ebuild,v 1.8 2004/03/09 23:32:24 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/libwww-5.4.0-r2.ebuild,v 1.9 2004/03/12 16:34:55 usata Exp $
inherit eutils
@@ -30,6 +30,7 @@ src_unpack() {
cd ${S}
epatch ${FILESDIR}/${PN}-config-liborder.patch
epatch ${WORKDIR}/${P}-debian-autoconf-2.5.patch
+ epatch ${FILESDIR}/${P}-autoconf-gentoo.diff
libtoolize -c -f || die "libtoolize failed"
aclocal || die "aclocal failed"