[GNUnet-SVN] r9909 - in Extractor: . src/plugins

[gnunet]

Author: holindho
Date: 2009-12-27 11:41:25 +0100 (Sun, 27 Dec 2009)
New Revision: 9909

Modified:
   Extractor/configure.ac
   Extractor/src/plugins/Makefile.am
Log:
stop propagating Qt flags to the whole build


Modified: Extractor/configure.ac
===================================================================
--- Extractor/configure.ac      2009-12-27 08:50:29 UTC (rev 9908)
+++ Extractor/configure.ac      2009-12-27 10:41:25 UTC (rev 9909)
@@ -338,6 +338,8 @@
 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_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(CPPFLAGS)
 AC_SUBST(LDFLAGS)
+AC_SUBST(QT_CPPFLAGS)
+AC_SUBST(QT_LDFLAGS)
 AC_SUBST(XTRA_CPPLIBS)
 AC_SUBST(LIBEXT)
 

Modified: Extractor/src/plugins/Makefile.am
===================================================================
--- Extractor/src/plugins/Makefile.am   2009-12-27 08:50:29 UTC (rev 9908)
+++ Extractor/src/plugins/Makefile.am   2009-12-27 10:41:25 UTC (rev 9909)
@@ -363,10 +363,12 @@
 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 = \