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 <alan@signal11.us>
Suggested-by: Jeremie Scheer <jeremie.scheer@armadeus.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
merge

diff --git a/package/poppler/Config.in b/package/poppler/Config.in
index fce296de4d8dfb736e635fc73b2afa67625406d9..5166e15c10a0f0cbd524a8642513306132ea8900 100644 (file)
--- 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 e4fee3f87afe785a2bbaa645a3838df288e794bf..a52b0799ca8a61aaa39116561bf68e4c1bb69769 100644 (file)
--- 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))