From a80f22fd9a6faa4f5fbb6e4cb0977aec2cb484a0 Mon Sep 17 00:00:00 2001
From: Heikki Lindholm <holin@iki.fi>
Date: Sun, 27 Dec 2009 10:41:25 +0000
Subject: stop propagating Qt flags to the whole build

---
 configure.ac            | 8 ++++++++
 src/plugins/Makefile.am | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/configure.ac b/configure.ac
index 16800ec..b56a7b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -338,6 +338,8 @@ if test "x$HAVE_CXX" = "xyes"
 then
   
 # check for Qt 4
+SAVED_CPPFLAGS=$CPPFLAGS
+SAVED_LDFLAGS=$LDFLAGS
 AC_LANG_PUSH([C++])
 AC_MSG_CHECKING(for Qt)
 AC_ARG_WITH(qt,
@@ -417,6 +419,10 @@ AC_ARG_WITH(qt,
               AC_CHECK_LIB([QtSvg], [_ZN10QSvgWidgetD0Ev],
               EXT_LIB_PATH="-L$with_qt/lib $EXT_LIB_PATH"
               qt_svg=1)))])
+QT_CPPFLAGS=$CPPFLAGS
+QT_LDFLAGS=$LDFLAGS
+LDFLAGS=$SAVED_LDFLAGS
+CPPFLAGS=$SAVED_CPPFLAGS
 
 exiv2=1
 AC_MSG_CHECKING([whether to enable exiv2 extractor])
@@ -536,6 +542,8 @@ AC_SUBST(LE_LIB_LIBS)
 
 AC_SUBST(CPPFLAGS)
 AC_SUBST(LDFLAGS)
+AC_SUBST(QT_CPPFLAGS)
+AC_SUBST(QT_LDFLAGS)
 AC_SUBST(XTRA_CPPLIBS)
 AC_SUBST(LIBEXT)
 
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 6f193c4..0868ebd 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -363,10 +363,12 @@ libextractor_thumbnailgtk_la_SOURCES = \
 libextractor_thumbnailqt_la_SOURCES = \
   thumbnailqt_extractor.cc
 libextractor_thumbnailqt_la_LDFLAGS = \
+  $(QT_LDFLAGS) \
   $(PLUGINFLAGS)
 libextractor_thumbnailqt_la_LIBADD = \
   $(qtflags) $(svgflags) 
 libextractor_thumbnailqt_la_CPPFLAGS = \
+  $(QT_CPPFLAGS) \
   $(QT_CFLAGS) $(QT_SVG_CFLAGS)
 
 libextractor_tiff_la_SOURCES = \
-- 
cgit v1.2.3