summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-26 21:30:03 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-26 21:30:03 +0000
commitbda1ab47e26ffa7e28e738b073fb46067e709d49 (patch)
tree7c66797d314bd561508c296b5bffd8d2c97d5ed6
parent698569f8428ca088f764d704034a1330517b98c0 (diff)
downloadkoffice-bda1ab47e26ffa7e28e738b073fb46067e709d49.tar.gz
koffice-bda1ab47e26ffa7e28e738b073fb46067e709d49.zip
Fix koffice poppler-tqt detection/usage
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1238436 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--filters/chalk/pdf/Makefile.am4
-rw-r--r--filters/chalk/pdf/configure.in.in3
2 files changed, 4 insertions, 3 deletions
diff --git a/filters/chalk/pdf/Makefile.am b/filters/chalk/pdf/Makefile.am
index 9357a98a..cb5376f7 100644
--- a/filters/chalk/pdf/Makefile.am
+++ b/filters/chalk/pdf/Makefile.am
@@ -9,7 +9,7 @@ INCLUDES = \
-I$(top_srcdir)/chalk/ui \
$(KOFFICE_INCLUDES) -I$(interfacedir) \
$(KOPAINTER_INCLUDES) \
- $(all_includes) $(POPPLER_CFLAGS)
+ $(all_includes) -I$(kde_includes)/kde
servicedir = $(kde_servicesdir)
@@ -21,7 +21,7 @@ libchalkpdfimport_la_LDFLAGS = -avoid-version -module -no-undefined $(KDE_PLUGI
-L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \
-L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../chalk/core/.libs/ -lchalkimage -L../../../chalk/ui/.libs/ -lchalkui -L../../../chalk/chalkcolor/.libs/ -lchalkcolor
libchalkpdfimport_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la \
- -lpoppler-qt $(KOFFICE_LIBS) $(POPPLER_LIBS)
+ -lpoppler-tqt $(KOFFICE_LIBS) $(POPPLER_LIBS)
noinst_HEADERS = kis_pdf_import.h kis_pdf_import_widget.h
libchalkpdfimport_la_SOURCES = kis_pdf_import.cpp pdfimportwidgetbase.ui \
diff --git a/filters/chalk/pdf/configure.in.in b/filters/chalk/pdf/configure.in.in
index e4343277..b8a36c1e 100644
--- a/filters/chalk/pdf/configure.in.in
+++ b/filters/chalk/pdf/configure.in.in
@@ -1,4 +1,5 @@
# Compile the pdf import filter only if Poppler is available
-PKG_CHECK_MODULES(POPPLER, poppler-qt >= 0.5.1, have_poppler=yes, have_poppler=no)
+# PKG_CHECK_MODULES(POPPLER, poppler-qt >= 0.5.1, have_poppler=yes, have_poppler=no)
+have_poppler=yes
AM_CONDITIONAL(include_PDF, test "x$have_poppler" = xyes)