From 4f8aad6dcb96b9ee2f4da45bb08a5f9379442445 Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Tue, 27 Aug 2013 09:09:39 +0200 Subject: [PATCH] qt4: fixed to only inject fontconfig includedir if it is installed --- qt/qt4/qt4.conf | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/qt/qt4/qt4.conf b/qt/qt4/qt4.conf index 566103c30..e90a13b93 100644 --- a/qt/qt4/qt4.conf +++ b/qt/qt4/qt4.conf @@ -14,8 +14,6 @@ # GNU General Public License can be found in the file COPYING. # --- SDE-COPYRIGHT-NOTE-END --- -var_append CXX_WRAPPER_APPEND ' ' "-I$root/$(pkgprefix includedir fontconfig)" - prefix="${SDECFG_PKG_QT4_PREFIX:-usr}" set_confopt if [ "$prefix" = "usr" ]; then @@ -63,6 +61,10 @@ EOT confopt="-prefix $root/$prefix -bindir $root/$bindir -libdir $root/$libdir -docdir $root/$docdir -headerdir $root/$includedir -plugindir $root/$libdir/$pkg/plugins -datadir $root/$datadir -translationdir $root/$datadir/translations -sysconfdir $root/$sysconfdir -v" +if pkginstalled -f fontconfig; then + var_append CXX_WRAPPER_APPEND ' ' "-I$root/$(pkgprefix includedir fontconfig)" +fi + # What may come from system? for x in zlib libtiff libpng libmng libjpeg openssl nas sqlite; do if pkginstalled $x; then