diff options
| author | Alexander Larsson <alexl@redhat.com> | 2019-09-20 12:55:10 +0200 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2019-09-20 13:58:46 +0000 |
| commit | 0a3963b479bf8f37f35c618d80c4daf343239638 (patch) | |
| tree | 776c853da3098cf161d093c04491e4c283c2e561 | |
| parent | a641bb76b21bb3d84291606d4758084223c9759c (diff) | |
| download | flatpak-0a3963b479bf8f37f35c618d80c4daf343239638.tar.gz | |
Only define GLIB_VERSION_MIN_REQUIRED if we detect a new glib
Otherwise the build failed on older glib version, but with this setup
we still disable all the GTimeVal deprecation warnings.
Closes: #3122
Approved by: alexlarsson
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 240abf3c..4e216ca5 100644 --- a/configure.ac +++ b/configure.ac @@ -34,8 +34,6 @@ SYSTEM_BWRAP_REQS=0.2.1 SYSTEM_DBUS_PROXY_REQS=0.1.0 OSTREE_REQS=2018.9 -AC_DEFINE(GLIB_VERSION_MIN_REQUIRED, GLIB_VERSION_2_60, [Ignore massive GTimeVal deprecation warnings in 2.62]) - AC_USE_SYSTEM_EXTENSIONS AC_SYS_LARGEFILE @@ -225,6 +223,10 @@ if test $have_libsystemd = yes; then AC_DEFINE(HAVE_LIBSYSTEMD, 1, [Define if libsystemd is available]) fi +PKG_CHECK_MODULES(GLIB260, glib-2.0 >= 2.60, + [AC_DEFINE(GLIB_VERSION_MIN_REQUIRED, GLIB_VERSION_2_60, [Ignore massive GTimeVal deprecation warnings in 2.62])], + [true]) + save_LIBS=$LIBS LIBS=$ARCHIVE_LIBS AC_CHECK_FUNCS(archive_read_support_filter_all) |