dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configure: use the poppler-data required version in pkg-config check. 

This makes no functional differences since this package has a pkg-config
file only since 0.4.7, our current requirement. This means that
searching for any poppler-data through pkg-config is the same as
searching for this minimum version.
But at least that makes for better output in case of error. People who
wish to build GIMP will have proper error information of the minimum
requirement for poppler-data.
This commit is contained in:
Jehan 2018-01-12 19:28:01 +01:00
parent b7e50ac46a
commit 341105366d
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure.ac
View File

@ -1729,13 +1729,10 @@ AM_CONDITIONAL(BUILD_PRINT, test "x$enable_print" = xyes)
# PDF import support is a granted feature. # PDF import support is a granted feature.
PKG_CHECK_MODULES(POPPLER, [poppler-glib >= poppler_required_version],, PKG_CHECK_MODULES(POPPLER, [poppler-glib >= poppler_required_version],,
[add_deps_error([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 # All modern distributions have at least this version and CJK/Cyrillic
# at least 0.4.7 since it has a pkg-config file since 0.4.7, thus we # support should not be considered as "second-zone citizen".
# can't verify presence of older versions. Anyway all modern PKG_CHECK_MODULES(POPPLER_DATA, [poppler-data >= poppler_data_required_version],,
# distributions have at least this version and CJK/Cyrillic support [add_deps_error([poppler-data >= poppler_data_required_version])])
# should not be considered as "second-zone citizen".
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 # 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 # desktop file. Even if cairo-pdf (used for PDF export) is not