diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-12-13 10:54:27 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2017-12-14 16:11:30 +0100 |
| commit | e8eecbcaaead516127497483958028fb58f8924f (patch) | |
| tree | dd06b051c390b1b0e3a5f33c6b7b7cb679f25cdb /configure.ac | |
| parent | 8582e9a837eb5bcf69ea5f82611e4a8cc3e67b98 (diff) | |
external: upload libepubgen-0.1.0
The only change is that version support is now available
unconditionally, otherwise most code changes were bundled already in the
form of patches.
(cherry picked from commits b2b1debf06589bd91e437df47a2904574aaae316 and
14c91e12b5bb3444235e1444eeefab42e21e3cb5)
Conflicts:
configure.ac
external/libepubgen/libepubgen-epub3.patch.1
writerperfect/source/writer/EPUBExportDialog.cxx
writerperfect/source/writer/EPUBExportFilter.cxx
Change-Id: I0e456d85c9d84002cabcd77b31b02c9a7ad16ac5
Reviewed-on: https://gerrit.libreoffice.org/46440
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/configure.ac b/configure.ac index 6a6aac317628..2ac35b7507df 100644 --- a/configure.ac +++ b/configure.ac @@ -7677,25 +7677,7 @@ libo_CHECK_SYSTEM_MODULE([librevenge],[REVENGE],[librevenge-0.0 >= 0.0.1],["-I${ libo_CHECK_SYSTEM_MODULE([libodfgen],[ODFGEN],[libodfgen-0.1]) -libo_CHECK_SYSTEM_MODULE([libepubgen],[EPUBGEN],[libepubgen-0.0]) -AS_IF([test "$SYSTEM_EPUBGEN" = "TRUE"], [ - AC_MSG_CHECKING([whether libepubgen supports setting EPUB version]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ - #include <libepubgen/libepubgen.h> - ], [ - const libepubgen::EPUBTextGenerator generator(nullptr, EPUB_SPLIT_METHOD_NONE, 30); - ])], - [ - AC_MSG_RESULT([yes]) - AC_DEFINE([LIBEPUBGEN_VERSION_SUPPORT]) - ], - [ - AC_MSG_RESULT([no]) - ] - ) -], [ - AC_DEFINE([LIBEPUBGEN_VERSION_SUPPORT]) -]) +libo_CHECK_SYSTEM_MODULE([libepubgen],[EPUBGEN],[libepubgen-0.1]) AS_IF([test "$COM" = "MSC"], [libwpd_libdir="${WORKDIR}/LinkTarget/Library"], @@ -12564,7 +12546,6 @@ AC_CONFIG_HEADERS([config_host/config_global.h]) AC_CONFIG_HEADERS([config_host/config_gpgme.h]) AC_CONFIG_HEADERS([config_host/config_java.h]) AC_CONFIG_HEADERS([config_host/config_lgpl.h]) -AC_CONFIG_HEADERS([config_host/config_libepubgen.h]) AC_CONFIG_HEADERS([config_host/config_liblangtag.h]) AC_CONFIG_HEADERS([config_host/config_locales.h]) AC_CONFIG_HEADERS([config_host/config_mpl.h]) |