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
This commit is contained in:
Alan Ott 2014-10-12 15:56:52 -04:00 committed by Thomas Petazzoni
parent 826f315d5f
commit fb79843453
2 changed files with 19 additions and 0 deletions

View File

@ -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

View File

@ -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))