forked from enlightenment/efl
Simplify and fix poppler discovery code
Now configure should abort in case poppler is not found (unless explicitly disabled) I'm still not sure about the hard "poppler < 0.40" requirement added by jpeg yesterday, we should fix the issue instead of tell "we don't support it"
This commit is contained in:
parent
8ce859f484
commit
c5f689a154
35
configure.ac
35
configure.ac
|
@ -2862,37 +2862,14 @@ have_rsvg="no"
|
||||||
|
|
||||||
### Check needed dependency for each generic loader
|
### Check needed dependency for each generic loader
|
||||||
if test "x${want_poppler}" = "xyes"; then
|
if test "x${want_poppler}" = "xyes"; then
|
||||||
PKG_CHECK_EXISTS([poppler >= 0.12 poppler < 0.20],
|
PKG_CHECK_MODULES([POPPLER], [poppler >= 0.12 poppler < 0.40],
|
||||||
[
|
[have_poppler="yes"])
|
||||||
poppler_pc="poppler >= 0.12 poppler < 0.20"
|
|
||||||
have_poppler="yes"
|
|
||||||
],
|
|
||||||
[have_poppler="no"])
|
|
||||||
|
|
||||||
if test "x${have_poppler}" = "xno" ; then
|
PKG_CHECK_EXISTS([poppler >= 0.20],
|
||||||
PKG_CHECK_EXISTS([poppler >= 0.20 poppler < 0.31],
|
[AC_DEFINE(HAVE_POPPLER_020, 1, [Have poppler at least 0.20])])
|
||||||
[
|
|
||||||
poppler_pc="poppler >= 0.20 poppler < 0.31"
|
|
||||||
AC_DEFINE(HAVE_POPPLER_020, 1, [Have poppler 0.20])
|
|
||||||
have_poppler="yes"
|
|
||||||
],
|
|
||||||
[have_poppler="no"])
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "x${have_poppler}" = "xno" ; then
|
PKG_CHECK_EXISTS([poppler >= 0.31],
|
||||||
PKG_CHECK_EXISTS([poppler >= 0.31 poppler < 0.40],
|
[AC_DEFINE(HAVE_POPPLER_031, 1, [Have poppler at least 0.31])])
|
||||||
[
|
|
||||||
poppler_pc="poppler >= 0.31"
|
|
||||||
AC_DEFINE(HAVE_POPPLER_031, 1, [Have poppler 0.31])
|
|
||||||
have_poppler="yes"
|
|
||||||
],
|
|
||||||
[have_poppler="no"])
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "x${have_poppler}" = "xyes" ; then
|
|
||||||
PKG_CHECK_MODULES([POPPLER], [${poppler_pc}],
|
|
||||||
[have_poppler="yes"])
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "x${want_spectre}" = "xyes"; then
|
if test "x${want_spectre}" = "xyes"; then
|
||||||
|
|
|
@ -161,7 +161,7 @@ void poppler_load_image(int size_w EINA_UNUSED, int size_h EINA_UNUSED)
|
||||||
if (!output_dev)
|
if (!output_dev)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
#if defined(HAVE_POPPLER_020) || defined(HAVE_POPPLER_031)
|
#ifdef HAVE_POPPLER_020
|
||||||
output_dev->startDoc(pdfdoc);
|
output_dev->startDoc(pdfdoc);
|
||||||
#else
|
#else
|
||||||
output_dev->startDoc(pdfdoc->getXRef());
|
output_dev->startDoc(pdfdoc->getXRef());
|
||||||
|
@ -174,7 +174,7 @@ void poppler_load_image(int size_w EINA_UNUSED, int size_h EINA_UNUSED)
|
||||||
output_dev->setVectorAntialias(EINA_TRUE);
|
output_dev->setVectorAntialias(EINA_TRUE);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(HAVE_POPPLER_020) || defined(HAVE_POPPLER_031)
|
#ifdef HAVE_POPPLER_020
|
||||||
page->displaySlice(output_dev, dpi, dpi,
|
page->displaySlice(output_dev, dpi, dpi,
|
||||||
0, false, false,
|
0, false, false,
|
||||||
0, 0, width, height,
|
0, 0, width, height,
|
||||||
|
|
Loading…
Reference in New Issue