Commit fb798434 authored by Alan Ott's avatar Alan Ott Committed by Thomas Petazzoni
Browse files

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: default avatarAlan Ott <alan@signal11.us>
Suggested-by: default avatarJeremie Scheer <jeremie.scheer@armadeus.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>

merge
parent 826f315d

package/poppler/Config.in

+12 −0
Original line number Diff line number Diff line
@@ -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

package/poppler/poppler.mk

+7 −0
Original line number Diff line number Diff line
@@ -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))