diff options
author | Albert Astals Cid <aacid@kde.org> | 2016-09-28 23:23:33 +0200 |
---|---|---|
committer | Albert Astals Cid <aacid@kde.org> | 2016-09-28 23:23:33 +0200 |
commit | 27cf7fabad27648019b36b2d6352e6767bfc8689 (patch) | |
tree | c88bedb42f0c10b05a2552b1ceb5b43f91c8ecb7 | |
parent | 86e50e156952713f0ce3ecc7b6f03f06dc0902c1 (diff) |
Increase glib requirement
Seems we've been requiring it for a while at least.
See "Build fail on Ubuntu 14.04" thread on the mailing list
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | configure.ac | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d59a6fc9..c86922a0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -96,7 +96,7 @@ set(TEXTOUT_WORD_LIST ON) # setting the minimum required versions for some components set(QT4_MIN_VERSION "4.7.0") set(CAIRO_VERSION "1.10.0") -set(GLIB_REQUIRED "2.18") +set(GLIB_REQUIRED "2.41") macro_bool_to_01(ENABLE_SPLASH HAVE_SPLASH) find_package(Freetype REQUIRED) diff --git a/configure.ac b/configure.ac index c4cfc2c6..f0303e03 100644 --- a/configure.ac +++ b/configure.ac @@ -639,7 +639,7 @@ if test x$enable_cairo_output = xyes; then POPPLER_GLIB_DISABLE_DEPRECATED="" POPPLER_GLIB_DISABLE_SINGLE_INCLUDES="" - GLIB_REQUIRED=2.18 + GLIB_REQUIRED=2.41 AC_SUBST(GLIB_REQUIRED) AC_ARG_ENABLE(poppler-glib, AC_HELP_STRING([--disable-poppler-glib], |