summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorDave Andreoli <dave@gurumeditation.it>2016-06-09 12:33:10 +0200
committerDave Andreoli <dave@gurumeditation.it>2016-06-09 12:33:10 +0200
commitc5f689a1542ee2699290641cb9ce7d3695a4fd9c (patch)
tree28ba201a121c5d43f96e28e82e83d492392e309a /configure.ac
parent8ce859f484a1669bb12621e84ebc9c67edba6769 (diff)
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"
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac35
1 files changed, 6 insertions, 29 deletions
diff --git a/configure.ac b/configure.ac
index b6616f3..43ceb4a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2862,37 +2862,14 @@ have_rsvg="no"
2862 2862
2863### Check needed dependency for each generic loader 2863### Check needed dependency for each generic loader
2864if test "x${want_poppler}" = "xyes"; then 2864if test "x${want_poppler}" = "xyes"; then
2865 PKG_CHECK_EXISTS([poppler >= 0.12 poppler < 0.20], 2865 PKG_CHECK_MODULES([POPPLER], [poppler >= 0.12 poppler < 0.40],
2866 [ 2866 [have_poppler="yes"])
2867 poppler_pc="poppler >= 0.12 poppler < 0.20"
2868 have_poppler="yes"
2869 ],
2870 [have_poppler="no"])
2871
2872 if test "x${have_poppler}" = "xno" ; then
2873 PKG_CHECK_EXISTS([poppler >= 0.20 poppler < 0.31],
2874 [
2875 poppler_pc="poppler >= 0.20 poppler < 0.31"
2876 AC_DEFINE(HAVE_POPPLER_020, 1, [Have poppler 0.20])
2877 have_poppler="yes"
2878 ],
2879 [have_poppler="no"])
2880 fi
2881 2867
2882 if test "x${have_poppler}" = "xno" ; then 2868 PKG_CHECK_EXISTS([poppler >= 0.20],
2883 PKG_CHECK_EXISTS([poppler >= 0.31 poppler < 0.40], 2869 [AC_DEFINE(HAVE_POPPLER_020, 1, [Have poppler at least 0.20])])
2884 [
2885 poppler_pc="poppler >= 0.31"
2886 AC_DEFINE(HAVE_POPPLER_031, 1, [Have poppler 0.31])
2887 have_poppler="yes"
2888 ],
2889 [have_poppler="no"])
2890 fi
2891 2870
2892 if test "x${have_poppler}" = "xyes" ; then 2871 PKG_CHECK_EXISTS([poppler >= 0.31],
2893 PKG_CHECK_MODULES([POPPLER], [${poppler_pc}], 2872 [AC_DEFINE(HAVE_POPPLER_031, 1, [Have poppler at least 0.31])])
2894 [have_poppler="yes"])
2895 fi
2896fi 2873fi
2897 2874
2898if test "x${want_spectre}" = "xyes"; then 2875if test "x${want_spectre}" = "xyes"; then