summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2017-12-13 10:54:27 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2017-12-14 09:09:35 +0100
commitb2b1debf06589bd91e437df47a2904574aaae316 (patch)
treee23a119ed85efdc88d430e1ca94052b57db32638 /configure.ac
parentf988c1b36454445a503f6d2c1d8dd52f902fcf0e (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. Change-Id: I0e456d85c9d84002cabcd77b31b02c9a7ad16ac5 Reviewed-on: https://gerrit.libreoffice.org/46386 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac22
1 files changed, 1 insertions, 21 deletions
diff --git a/configure.ac b/configure.ac
index e10df21a70ed..20e1fb48e45b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7746,26 +7746,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>
- ], [
- libepubgen::EPUBTextGenerator generator(nullptr);
- generator.setOption(libepubgen::EPUB_GENERATOR_OPTION_SPLIT, libepubgen::EPUB_SPLIT_METHOD_NONE);
- ])],
- [
- 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"],
@@ -12532,7 +12513,6 @@ 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_libcxx.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])