[gimp] configure: don't nest anymore poppler and poppler-data checks.



commit 1d0fa313eaa1ddc6991da0312761dec48cc99fa5
Author: Jehan <jehan girinstud io>
Date:   Thu Dec 28 16:37:43 2017 +0100

    configure: don't nest anymore poppler and poppler-data checks.
    
    Since they are both mandatory dependencies now, no need to do a nested
    check anymore. Also I was getting some weird warnings in the configure
    output (maybe also because of missing square brackets?), which are
    coincidentally fixed this way as well.

 configure.ac |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 2bd371c..2ee38be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1724,15 +1724,16 @@ AM_CONDITIONAL(BUILD_PRINT, test "x$enable_print" = xyes)
 # Check for libpoppler
 ######################
 
+# PDF import support is a granted feature.
+PKG_CHECK_MODULES(POPPLER, [poppler-glib >= poppler_required_version],,
+                  [add_deps_error([poppler-glib >= poppler_required_version])])
 # We don't check against a poppler-data version, which basically means
 # at least 0.4.7 since it has a pkg-config file since 0.4.7, thus we
 # can't verify presence of older versions. Anyway all modern
 # distributions have at least this version and CJK/Cyrillic support
 # should not be considered as "second-zone citizen".
-PKG_CHECK_MODULES(POPPLER, [poppler-glib >= poppler_required_version],
-                  PKG_CHECK_MODULES(POPPLER_DATA, poppler-data,,
-                                    [add_deps_error([poppler-data])]),
-                  [add_deps_error([poppler-glib >= poppler_required_version])])
+PKG_CHECK_MODULES(POPPLER_DATA, [poppler-data],,
+                  [add_deps_error([poppler-data])])
 
 # MIME_TYPES is for the formats we can open as used for instance in the
 # desktop file. Even if cairo-pdf (used for PDF export) is not


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]