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/source/ooo/file_ooo.scp | |
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/source/ooo/file_ooo.scp')
-rw-r--r-- | scp2/source/ooo/file_ooo.scp | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 9079a4f6247d..6b30e7212cff 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -115,29 +115,6 @@ File gid_File_Exe_Nsplugin End #endif -#if !defined WITHOUT_PDFIMPORT - -Directory gid_Dir_Share_Xpdfimport - ParentID = gid_Brand_Dir_Share; - DosName = "xpdfimport"; -End - -File gid_File_Dat_XpdfimportErrPdf - TXT_FILE_BODY; - Dir = gid_Dir_Share_Xpdfimport; - Name = "xpdfimport_err.pdf"; - Styles = (PACKED); -End - -File gid_File_Exe_Xpdfimport - BIN_FILE_BODY; - Dir = gid_Brand_Dir_Program; - Name = EXENAME(xpdfimport); - Styles = (PACKED); -End - -#endif - File gid_File_Bin_Gengal BIN_FILE_BODY; Dir = gid_Brand_Dir_Program; |