Pass -importdir to configure only for qt >= 4.7 (bug #396685).

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 566dd1df23f0a931f2d2f3f598c2afb91caa87ab..3e358624449631ad00a832352d6d96c60743ddb7 100644 (file)
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.66 2012/01/01 05:02:27 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.67 2012/01/01 19:01:11 pesa Exp $
+
+  01 Jan 2012; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
+  Pass -importdir to configure only for qt >= 4.7 (bug #396685).
 
   01 Jan 2012; Mike Gilbert <floppym@gentoo.org> distutils.eclass,
   python.eclass:

diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index 92a77809e9f22f059c349cc4ce0c125aeb4095e9..c3dd7f4b8632122ee994eeeab613e54c61eb1383 100644 (file)
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.114 2012/01/01 18:12:03 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.115 2012/01/01 19:01:11 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -462,8 +462,9 @@ setqtenv() {
 standard_configure_options() {
        local myconf="-prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR}
                -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} -plugindir ${QTPLUGINDIR}
-               -importdir ${QTIMPORTDIR} -datadir ${QTDATADIR} -translationdir ${QTTRANSDIR}
-               -sysconfdir ${QTSYSCONFDIR} -examplesdir ${QTEXAMPLESDIR} -demosdir ${QTDEMOSDIR}
+               $(version_is_at_least 4.7 && echo -importdir ${QTIMPORTDIR})
+               -datadir ${QTDATADIR} -translationdir ${QTTRANSDIR} -sysconfdir ${QTSYSCONFDIR}
+               -examplesdir ${QTEXAMPLESDIR} -demosdir ${QTDEMOSDIR}
                -opensource -confirm-license -shared -fast -largefile -stl -verbose
                -platform $(qt_mkspecs_dir) -nomake examples -nomake demos"