From fb79843453704ae68cf8d91e2a9cd5359d0b1027 Mon Sep 17 00:00:00 2001 From: Alan Ott Date: Sun, 12 Oct 2014 15:56:52 -0400 Subject: [PATCH] poppler: Add option for Qt support Add an option to build the libpoppler-qt4 library. [Thomas: slightly adjust the Config.in file, by: - Using an if BR2_PACKAGE_POPPLER ... endif block instead of a depends on BR2_PACKAGE_POPPLER for the new option. - Rewording the option prompt, since there's no need to indicate that the Qt support is for poppler since we're already a sub-option of poppler.] Signed-off-by: Alan Ott Suggested-by: Jeremie Scheer Signed-off-by: Thomas Petazzoni merge --- package/poppler/Config.in | 12 ++++++++++++ package/poppler/poppler.mk | 7 +++++++ 2 files changed, 19 insertions(+) diff --git a/package/poppler/Config.in b/package/poppler/Config.in index fce296de4d..5166e15c10 100644 --- a/package/poppler/Config.in +++ b/package/poppler/Config.in @@ -10,5 +10,17 @@ config BR2_PACKAGE_POPPLER http://poppler.freedesktop.org/ +if BR2_PACKAGE_POPPLER + +config BR2_PACKAGE_POPPLER_QT + bool "Qt support" + depends on BR2_PACKAGE_QT + select BR2_PACKAGE_QT_GUI + select BR2_PACKAGE_QT_XML + help + Build Qt support into the Poppler library + +endif + comment "poppler needs a toolchain w/ C++, threads" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk index e4fee3f87a..a52b0799ca 100644 --- a/package/poppler/poppler.mk +++ b/package/poppler/poppler.mk @@ -61,4 +61,11 @@ else POPPLER_CONF_OPTS += --without-x endif +ifeq ($(BR2_PACKAGE_POPPLER_QT),y) + POPPLER_DEPENDENCIES += qt + POPPLER_CONF_OPTS += --enable-poppler-qt4 +else + POPPLER_CONF_OPTS += --disable-poppler-qt4 +endif + $(eval $(autotools-package))