Fixed compilation if canna is not installed (and USE="-canna"); bug #70578.

diff --git a/app-i18n/iiimf-skk/ChangeLog b/app-i18n/iiimf-skk/ChangeLog
index 1259183eed0017f488f6902ee0e9247b38cccc48..fb7d2a9f2c1bbac484b4979ba4dfb35d23e44902 100644 (file)
--- a/app-i18n/iiimf-skk/ChangeLog
+++ b/app-i18n/iiimf-skk/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-i18n/iiimf-skk
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/iiimf-skk/ChangeLog,v 1.2 2004/09/14 08:27:21 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/iiimf-skk/ChangeLog,v 1.3 2004/11/10 10:35:27 usata Exp $
+
+  10 Nov 2004; Mamoru KOMACHI <usata@gentoo.org> iiimf-skk-0.1.22.95.ebuild:
+  Fixed compilation if canna is not installed (and USE="-canna"); bug #70578.
 
   14 Sep 2004; Mamoru KOMACHI <usata@gentoo.org> iiimf-skk-0.1.22.95.ebuild:
   Added einfos to tell how to use the module.

diff --git a/app-i18n/iiimf-skk/Manifest b/app-i18n/iiimf-skk/Manifest
index 7b12f2fdb848b730f1b83f582e6cec3831ef4322..5abc716b037f947eeebc2f6ee4587d04a454d963 100644 (file)
--- a/app-i18n/iiimf-skk/Manifest
+++ b/app-i18n/iiimf-skk/Manifest
@@ -1,5 +1,5 @@
-MD5 7c5564c3b748a5e54ee266a4a544c3cb iiimf-skk-0.1.22.95.ebuild 1462
+MD5 826c527f5f706c1b0f60d9613f5d1672 iiimf-skk-0.1.22.95.ebuild 1630
+MD5 474366b15e2259098f49a02d4694ccc7 ChangeLog 659
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 3f28b74901a5e01d8ce8c575e3208494 ChangeLog 503
 MD5 ae3a2a76ea0556200d71b7d9e7d8fddb files/iiimf-skk.sh 330
 MD5 f092f15fe79292787a2e1f9029ca5211 files/digest-iiimf-skk-0.1.22.95 152

diff --git a/app-i18n/iiimf-skk/iiimf-skk-0.1.22.95.ebuild b/app-i18n/iiimf-skk/iiimf-skk-0.1.22.95.ebuild
index e1bc8d37b3b2b1dfe9c287d6a3a80f2f14bfdf57..a218e355f11ee038184593501e213c7c687afae4 100644 (file)
--- a/app-i18n/iiimf-skk/iiimf-skk-0.1.22.95.ebuild
+++ b/app-i18n/iiimf-skk/iiimf-skk-0.1.22.95.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/iiimf-skk/iiimf-skk-0.1.22.95.ebuild,v 1.2 2004/09/14 08:27:21 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/iiimf-skk/iiimf-skk-0.1.22.95.ebuild,v 1.3 2004/11/10 10:35:27 usata Exp $
 
 inherit eutils
 
@@ -31,14 +31,17 @@ src_unpack() {
 
 src_compile() {
 
+       local myconf
+       # configure script is broken wrt --disable-*
+       use nls && myconf="${myconf} --enable-nls"
+       use gtk2 && myconf="${myconf} --enable-gtk2"
+       use debug && myconf="${myconf} --enable-debug"
+       use canna && myconf="${myconf} --enable-canna"
+
        econf \
-               `use_enable nls` \
-               `use_enable gtk2` \
-               `use_enable debug` \
-               `use_enable canna` \
                --with-skkserv-host="localhost" \
                --with-skkserv-port=1178 \
-               || die "econf failed"
+               ${myconf} || die "econf failed"
        emake -j1 || die
 }