diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-11-29 11:27:45 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-11-29 11:36:58 +0100 |
| commit | 79e5ee5f6949f4b8645ef32dba61705d02473c60 (patch) | |
| tree | 2042e4b002d19e7d828b838537278ca9f10da629 /scp2/InstallModule_ooo.mk | |
| parent | 053108588dd634838457ba81e7dc70e82aa50e02 (diff) | |
Isolate PDF Import so it can be made optionally installable
...which can be attractive for installation sets that use --with-system-poppler
but do not want the LO core package to depend on a poppler package. See the
comment at the top of scp2/source/ooo/module_pdfimport.scp for details.
The build-time --disable-pdfimport configure switch is gone, PDF Import is built
unconditionally for all platforms but Android and iOS now. (The
ENABLE_PDFIMPORT variable now uses TRUE/FALSE rather than YES/NO, to increase
consistency across those variables.)
Change-Id: I6509d0b2e770b276cd54540408fb1ec5a7dda058
Diffstat (limited to 'scp2/InstallModule_ooo.mk')
| -rw-r--r-- | scp2/InstallModule_ooo.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index 57676b3ba577..23fbb67dbcaf 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -230,4 +230,10 @@ $(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/ooo,\ scp2/source/ooo/module_systemint \ )) +ifeq ($(ENABLE_PDFIMPORT),TRUE) +$(eval $(call gb_InstallModule_add_scpfiles,scp2/ooo,\ + scp2/source/ooo/module_pdfimport \ +)) +endif + # vim: set shiftwidth=4 tabstop=4 noexpandtab: |