diff options
author | Heikki Lindholm <holin@iki.fi> | 2009-12-27 10:41:25 +0000 |
---|---|---|
committer | Heikki Lindholm <holin@iki.fi> | 2009-12-27 10:41:25 +0000 |
commit | a80f22fd9a6faa4f5fbb6e4cb0977aec2cb484a0 (patch) | |
tree | 7a6294d2925f36e07430a1880f8f87ab291a839e | |
parent | bd14367713de0789d0ec786b2a201a8ecacc029a (diff) | |
download | libextractor-a80f22fd9a6faa4f5fbb6e4cb0977aec2cb484a0.tar.gz libextractor-a80f22fd9a6faa4f5fbb6e4cb0977aec2cb484a0.zip |
stop propagating Qt flags to the whole build
-rw-r--r-- | configure.ac | 8 | ||||
-rw-r--r-- | src/plugins/Makefile.am | 2 |
2 files changed, 10 insertions, 0 deletions
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" | |||
338 | then | 338 | then |
339 | 339 | ||
340 | # check for Qt 4 | 340 | # check for Qt 4 |
341 | SAVED_CPPFLAGS=$CPPFLAGS | ||
342 | SAVED_LDFLAGS=$LDFLAGS | ||
341 | AC_LANG_PUSH([C++]) | 343 | AC_LANG_PUSH([C++]) |
342 | AC_MSG_CHECKING(for Qt) | 344 | AC_MSG_CHECKING(for Qt) |
343 | AC_ARG_WITH(qt, | 345 | AC_ARG_WITH(qt, |
@@ -417,6 +419,10 @@ AC_ARG_WITH(qt, | |||
417 | AC_CHECK_LIB([QtSvg], [_ZN10QSvgWidgetD0Ev], | 419 | AC_CHECK_LIB([QtSvg], [_ZN10QSvgWidgetD0Ev], |
418 | EXT_LIB_PATH="-L$with_qt/lib $EXT_LIB_PATH" | 420 | EXT_LIB_PATH="-L$with_qt/lib $EXT_LIB_PATH" |
419 | qt_svg=1)))]) | 421 | qt_svg=1)))]) |
422 | QT_CPPFLAGS=$CPPFLAGS | ||
423 | QT_LDFLAGS=$LDFLAGS | ||
424 | LDFLAGS=$SAVED_LDFLAGS | ||
425 | CPPFLAGS=$SAVED_CPPFLAGS | ||
420 | 426 | ||
421 | exiv2=1 | 427 | exiv2=1 |
422 | AC_MSG_CHECKING([whether to enable exiv2 extractor]) | 428 | AC_MSG_CHECKING([whether to enable exiv2 extractor]) |
@@ -536,6 +542,8 @@ AC_SUBST(LE_LIB_LIBS) | |||
536 | 542 | ||
537 | AC_SUBST(CPPFLAGS) | 543 | AC_SUBST(CPPFLAGS) |
538 | AC_SUBST(LDFLAGS) | 544 | AC_SUBST(LDFLAGS) |
545 | AC_SUBST(QT_CPPFLAGS) | ||
546 | AC_SUBST(QT_LDFLAGS) | ||
539 | AC_SUBST(XTRA_CPPLIBS) | 547 | AC_SUBST(XTRA_CPPLIBS) |
540 | AC_SUBST(LIBEXT) | 548 | AC_SUBST(LIBEXT) |
541 | 549 | ||
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 = \ | |||
363 | libextractor_thumbnailqt_la_SOURCES = \ | 363 | libextractor_thumbnailqt_la_SOURCES = \ |
364 | thumbnailqt_extractor.cc | 364 | thumbnailqt_extractor.cc |
365 | libextractor_thumbnailqt_la_LDFLAGS = \ | 365 | libextractor_thumbnailqt_la_LDFLAGS = \ |
366 | $(QT_LDFLAGS) \ | ||
366 | $(PLUGINFLAGS) | 367 | $(PLUGINFLAGS) |
367 | libextractor_thumbnailqt_la_LIBADD = \ | 368 | libextractor_thumbnailqt_la_LIBADD = \ |
368 | $(qtflags) $(svgflags) | 369 | $(qtflags) $(svgflags) |
369 | libextractor_thumbnailqt_la_CPPFLAGS = \ | 370 | libextractor_thumbnailqt_la_CPPFLAGS = \ |
371 | $(QT_CPPFLAGS) \ | ||
370 | $(QT_CFLAGS) $(QT_SVG_CFLAGS) | 372 | $(QT_CFLAGS) $(QT_SVG_CFLAGS) |
371 | 373 | ||
372 | libextractor_tiff_la_SOURCES = \ | 374 | libextractor_tiff_la_SOURCES = \ |