Only need to specify include paths for -mozilla, otherwise pkgconfig will work

3 files changed, 21 insertions, 18 deletions

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index f10865253e73..6943a16e254b 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-im/gaim
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.106 2003/12/12 20:03:17 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.107 2003/12/22 22:54:16 rizzo Exp $
+
+  22 Dec 2003; Don Seiler <rizzo@gentoo.org>; gaim-0.74-r1.ebuild:
+  Only need to specify include paths for -mozilla, otherwise pkgconfig will work
 
   12 Dec 2003; Don Seiler <rizzo@gentoo.org>; gaim-0.66-r3.ebuild,
   gaim-0.70-r2.ebuild, gaim-0.71-r2.ebuild, gaim-0.73-r1.ebuild,
diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index aa84871ac48c..0c9bcdbbb211 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -1,9 +1,9 @@
-MD5 488a1c05ab1585ddf75b78a6766f289c gaim-0.74-r1.ebuild 3482
+MD5 bd71eaae41b7ff4dbe901d7184f23dad gaim-0.74-r1.ebuild 3552
 MD5 bed467c3e7077888cf4fd615c5f47678 gaim-0.67.ebuild 2185
 MD5 3dc9c94c6beb41d2314814297ff004ea gaim-0.72-r2.ebuild 3331
 MD5 00da5062575561e913be722ee23a1982 gaim-0.72-r1.ebuild 2890
 MD5 9c060fe66488650173c0a493e8744b0a gaim-0.72.ebuild 2508
-MD5 7a68a2262daeeda8ee1e219f6b12159f ChangeLog 17532
+MD5 5cb83d20c3a3c8266031c47055031b7c ChangeLog 17681
 MD5 19b3cafbbe380403d46cccc45a984b80 metadata.xml 481
 MD5 5993641de8d56c2c433f252997c3c39c files/digest-gaim-0.67 135
 MD5 e6a8773cabdf14d7422e573723258437 files/digest-gaim-0.72 135
diff --git a/net-im/gaim/gaim-0.74-r1.ebuild b/net-im/gaim/gaim-0.74-r1.ebuild
index b1e8480384f0..eba4b553a342 100644
--- a/net-im/gaim/gaim-0.74-r1.ebuild
+++ b/net-im/gaim/gaim-0.74-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.74-r1.ebuild,v 1.3 2003/12/12 15:49:47 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.74-r1.ebuild,v 1.4 2003/12/22 22:54:16 rizzo Exp $
 
 IUSE="nls perl spell nas ssl mozilla cjk debug"
 
@@ -49,18 +49,15 @@ src_compile() {
 	use nas && myconf="${myconf} --enable-nas" || myconf="${myconf} --disable-nas"
 	use debug  && myconf="${myconf} --enable-debug"
 
-	if [ `use mozilla` ]; then
-		NSS_LIB=/usr/lib/mozilla
-		NSS_INC=/usr/lib/mozilla/include
-	else
+	use mozilla || {
+		# Only need to specify this if no pkgconfig from mozilla
 		NSS_LIB=/usr/lib
 		NSS_INC=/usr/include
-	fi
-
-	myconf="${myconf} --with-nspr-includes=${NSS_INC}/nspr"
-	myconf="${myconf} --with-nss-includes=${NSS_INC}/nss"
-	myconf="${myconf} --with-nspr-libs=${NSS_LIB}"
-	myconf="${myconf} --with-nss-libs=${NSS_LIB}"
+		myconf="${myconf} --with-nspr-includes=${NSS_INC}/nspr"
+		myconf="${myconf} --with-nss-includes=${NSS_INC}/nss"
+		myconf="${myconf} --with-nspr-libs=${NSS_LIB}"
+		myconf="${myconf} --with-nss-libs=${NSS_LIB}"
+	}
 
 	econf ${myconf} || die "Configuration failed"
 	use perl && sed -i -e 's:^\(PERL_MM_PARAMS =.*PREFIX=\)\(.*\):\1'${D}'\2:' plugins/perl/Makefile
@@ -74,10 +71,13 @@ src_compile() {
 		local myencconf
 		cd ${S}/plugins/gaim-encryption-${EV}
 
-		myencconf="${myencconf} --with-nspr-includes=${NSS_INC}/nspr"
-		myencconf="${myencconf} --with-nss-includes=${NSS_INC}/nss"
-		myencconf="${myencconf} --with-nspr-libs=${NSS_LIB}"
-		myencconf="${myencconf} --with-nss-libs=${NSS_LIB}"
+		use mozilla || {
+			# Only need to specify this if no pkgconfig from mozilla
+			myencconf="${myencconf} --with-nspr-includes=${NSS_INC}/nspr"
+			myencconf="${myencconf} --with-nss-includes=${NSS_INC}/nss"
+			myencconf="${myencconf} --with-nspr-libs=${NSS_LIB}"
+			myencconf="${myencconf} --with-nss-libs=${NSS_LIB}"
+		}
 		econf ${myencconf} || die "Configuration failed for encryption"
 		emake || die "Make failed for encryption"
 	}