projects / packages / libextractor.git / blame
| Commit | Line | Data |
|---|---|---|
| 22d7e883 JB |
1 | --- libextractor-0.5.15/src/plugins/Makefile.am.orig 2006-09-16 00:40:25.022938000 +0200 |
| 2 | +++ libextractor-0.5.15/src/plugins/Makefile.am 2006-09-16 00:52:22.479776250 +0200 | |
| 3 | @@ -16,7 +16,7 @@ | |
| 4 | endif | |
| 5 | ||
| 6 | if HAVE_QT_SVG | |
| 7 | - svgflags = -lQtSvg4 | |
| 8 | + svgflags = -lQtSvg | |
| 9 | endif | |
| 10 | ||
| 11 | if HAVE_PRINTABLE | |
| 12 | @@ -306,7 +306,7 @@ | |
| 13 | libextractor_thumbnailqt_la_LIBADD = \ | |
| 14 | $(top_builddir)/src/main/libextractor.la | |
| 15 | libextractor_thumbnailqt_la_LDFLAGS = \ | |
| 16 | - $(PLUGINFLAGS) $(retaincommand) -lQtCore4 -lQtGui4 $(svgflags) | |
| 17 | + $(PLUGINFLAGS) $(retaincommand) -lQtCore -lQtGui $(svgflags) | |
| 18 | ||
| 19 | install-exec-hook: | |
| 20 | install -d $(DESTDIR)$(plugindir) 2> /dev/null | |
| 21 | --- libextractor-0.5.15/configure.ac.orig 2006-09-16 00:40:27.623100000 +0200 | |
| 22 | +++ libextractor-0.5.15/configure.ac 2006-09-16 00:53:04.402396250 +0200 | |
| 23 | @@ -273,14 +273,14 @@ | |
| 24 | ;; | |
| 25 | yes) | |
| 26 | AC_CHECK_HEADERS(qpixmap.h, | |
| 27 | - AC_CHECK_LIB([QtGui4], [_ZN7QPixmap12defaultDepthEv], | |
| 28 | + AC_CHECK_LIB([QtGui], [_ZN7QPixmap12defaultDepthEv], | |
| 29 | qt=1)) | |
| 30 | ;; | |
| 31 | *) | |
| 32 | LDFLAGS="-L$with_qt/lib $LDFLAGS" | |
| 33 | CPPFLAGS="-I$with_qt/include -I$with_qt/include/Qt $CPPFLAGS" | |
| 34 | AC_CHECK_HEADERS(qpixmap.h, | |
| 35 | - AC_CHECK_LIB([QtGui4], [_ZN7QPixmap12defaultDepthEv], | |
| 36 | + AC_CHECK_LIB([QtGui], [_ZN7QPixmap12defaultDepthEv], | |
| 37 | EXT_LIB_PATH="-L$with_qt/lib $EXT_LIB_PATH" | |
| 38 | qt=1)) | |
| 39 | ;; | |
| 40 | @@ -288,7 +288,7 @@ | |
| 41 | ], | |
| 42 | [AC_MSG_RESULT([--with-qt not specified]) | |
| 43 | AC_CHECK_HEADERS(qpixmap.h, | |
| 44 | - AC_CHECK_LIB([QtGui4], [_ZN7QPixmap12defaultDepthEv], | |
| 45 | + AC_CHECK_LIB([QtGui], [_ZN7QPixmap12defaultDepthEv], | |
| 46 | qt=1))]) | |
| 47 | ||
| 48 | if test x$qt != x0 | |
| 49 | @@ -307,14 +307,14 @@ | |
| 50 | ;; | |
| 51 | yes) | |
| 52 | AC_CHECK_HEADERS(qsvgrenderer.h, | |
| 53 | - AC_CHECK_LIB([QtSvg4], [_ZN10QSvgWidgetD0Ev], | |
| 54 | + AC_CHECK_LIB([QtSvg], [_ZN10QSvgWidgetD0Ev], | |
| 55 | qt_svg=1)) | |
| 56 | ;; | |
| 57 | *) | |
| 58 | LDFLAGS="-L$with_qt/lib $LDFLAGS" | |
| 59 | CPPFLAGS="-I$with_qt/include -I$with_qt/include/Qt $CPPFLAGS" | |
| 60 | AC_CHECK_HEADERS(qsvgrenderer.h, | |
| 61 | - AC_CHECK_LIB([QtSvg4], [_ZN10QSvgWidgetD0Ev], | |
| 62 | + AC_CHECK_LIB([QtSvg], [_ZN10QSvgWidgetD0Ev], | |
| 63 | EXT_LIB_PATH="-L$with_qt/lib $EXT_LIB_PATH" | |
| 64 | qt_svg=1)) | |
| 65 | ;; | |
| 66 | @@ -322,7 +322,7 @@ | |
| 67 | ], | |
| 68 | [AC_MSG_RESULT([--with-qt not specified]) | |
| 69 | AC_CHECK_HEADERS(qsvgrenderer.h, | |
| 70 | - AC_CHECK_LIB([QtSvg4], [_ZN10QSvgWidgetD0Ev], | |
| 71 | + AC_CHECK_LIB([QtSvg], [_ZN10QSvgWidgetD0Ev], | |
| 72 | qt_svg=1))]) | |
| 73 | ||
| 74 | if test x$qt_svg != x0 |