Kaydet (Commit) 0569cbb5 authored tarafından Ashod Nakashian's avatar Ashod Nakashian Kaydeden (comit) Andras Timar

build: sanity check PDF import configuration

Reviewed-on: https://gerrit.libreoffice.org/68861Reviewed-by: 's avatarAndras Timar <andras.timar@collabora.com>
Tested-by: 's avatarAndras Timar <andras.timar@collabora.com>
(cherry picked from commit 172f58ca)

Change-Id: I26c54ad52ab53802dc368b0bfcbde84affa46fdd
Reviewed-on: https://gerrit.libreoffice.org/68897
Tested-by: Jenkins
Reviewed-by: 's avatarAndras Timar <andras.timar@collabora.com>
üst 65207c7c
...@@ -10649,10 +10649,21 @@ AC_SUBST([DCONF_CFLAGS]) ...@@ -10649,10 +10649,21 @@ AC_SUBST([DCONF_CFLAGS])
AC_SUBST([DCONF_LIBS]) AC_SUBST([DCONF_LIBS])
AC_SUBST([ENABLE_DCONF]) AC_SUBST([ENABLE_DCONF])
# pdf import?
AC_MSG_CHECKING([whether to build the PDF import feature])
ENABLE_PDFIMPORT=
if test $_os != Android -a $_os != iOS -a \( -z "$enable_pdfimport" -o "$enable_pdfimport" = yes \); then
AC_MSG_RESULT([yes])
ENABLE_PDFIMPORT=TRUE
AC_DEFINE(HAVE_FEATURE_PDFIMPORT)
else
AC_MSG_RESULT([no])
fi
# Pdfium? # Pdfium?
AC_MSG_CHECKING([whether to build PDFium]) AC_MSG_CHECKING([whether to build PDFium])
ENABLE_PDFIUM= ENABLE_PDFIUM=
if test -z "$enable_pdfium" -o "$enable_pdfium" = yes; then if test \( -z "$enable_pdfium" -a "$ENABLE_PDFIMPORT" == "TRUE" \) -o "$enable_pdfium" = yes; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
ENABLE_PDFIUM=TRUE ENABLE_PDFIUM=TRUE
AC_DEFINE(HAVE_FEATURE_PDFIUM) AC_DEFINE(HAVE_FEATURE_PDFIUM)
...@@ -10666,8 +10677,8 @@ dnl =================================================================== ...@@ -10666,8 +10677,8 @@ dnl ===================================================================
dnl Check for poppler dnl Check for poppler
dnl =================================================================== dnl ===================================================================
ENABLE_POPPLER= ENABLE_POPPLER=
AC_MSG_CHECKING([enable poppler]) AC_MSG_CHECKING([whether to build Poppler])
if test -z "$enable_poppler" -o "$enable_poppler" = yes; then if test \( -z "$enable_poppler" -a "$ENABLE_PDFIMPORT" == "TRUE" \) -o "$enable_poppler" = yes; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
ENABLE_POPPLER=TRUE ENABLE_POPPLER=TRUE
AC_DEFINE(HAVE_FEATURE_POPPLER) AC_DEFINE(HAVE_FEATURE_POPPLER)
...@@ -10676,22 +10687,19 @@ else ...@@ -10676,22 +10687,19 @@ else
fi fi
AC_SUBST(ENABLE_POPPLER) AC_SUBST(ENABLE_POPPLER)
# pdf import? if test "$ENABLE_PDFIMPORT" == "TRUE" -a "$ENABLE_POPPLER" != "TRUE" -a "$ENABLE_PDFIUM" != "TRUE"; then
AC_MSG_CHECKING([whether to build the PDF import feature]) AC_MSG_ERROR([Cannot import PDF without either Pdfium or Poppler; please enable either of them.])
ENABLE_PDFIMPORT= fi
if test $_os != Android -a $_os != iOS -a \( -z "$enable_pdfimport" -o "$enable_pdfimport" = yes \); then
AC_MSG_RESULT([yes]) if test "$ENABLE_PDFIMPORT" != "TRUE" -a \( "$ENABLE_POPPLER" == "TRUE" -o "$ENABLE_PDFIUM" == "TRUE" \); then
ENABLE_PDFIMPORT=TRUE AC_MSG_ERROR([Cannot enable Pdfium or Poppler when PDF importing is disabled; please enable PDF import first.])
AC_DEFINE(HAVE_FEATURE_PDFIMPORT)
else
AC_MSG_RESULT([no])
fi fi
if test $ENABLE_PDFIMPORT == TRUE -a $ENABLE_POPPLER == TRUE; then if test "$ENABLE_PDFIMPORT" == "TRUE" -a "$ENABLE_POPPLER" == "TRUE"; then
dnl =================================================================== dnl ===================================================================
dnl Check for system poppler dnl Check for system poppler
dnl =================================================================== dnl ===================================================================
AC_MSG_CHECKING([which PDF import backend to use]) AC_MSG_CHECKING([which PDF import poppler to use])
if test "$with_system_poppler" = "yes"; then if test "$with_system_poppler" = "yes"; then
AC_MSG_RESULT([external]) AC_MSG_RESULT([external])
SYSTEM_POPPLER=TRUE SYSTEM_POPPLER=TRUE
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment