From b30e3d4267cc0a22511e33741305366da8b7070a Mon Sep 17 00:00:00 2001 From: AndersBroman Date: Thu, 5 Apr 2018 08:19:30 +0200 Subject: [PATCH] glib: Require 2.32 or newer. Change-Id: Idaf90865d04532912a968fc2e05523aec14c4991 Reviewed-on: https://code.wireshark.org/review/26745 Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- CMakeLists.txt | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8bc9186a69..da13fd9e2d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -879,7 +879,7 @@ set(PACKAGELIST Git GLIB2 GMODULE2 GTHREAD2 GCRYPT LEX YACC Perl PythonInterp) set(LEX_OPTIONS REQUIRED) set(GLIB2_OPTIONS REQUIRED) set(GLIB2_FIND_OPTIONS REQUIRED) -set(GLIB2_MIN_VERSION 2.22.0) +set(GLIB2_MIN_VERSION 2.32.0) set(GTHREAD2_OPTIONS REQUIRED) set(GCRYPT_OPTIONS "1.4.2" REQUIRED) set(PythonInterp_FIND_VERSION 2) diff --git a/configure.ac b/configure.ac index ed0537a09a..c445aeeab3 100644 --- a/configure.ac +++ b/configure.ac @@ -1089,7 +1089,7 @@ AC_ARG_ENABLE(wireshark, enable_wireshark=$enableval,enable_wireshark=yes) AM_CONDITIONAL(BUILDING_WIRESHARK, test x$enable_wireshark = xyes) -GLIB_MIN_VERSION=2.22.0 +GLIB_MIN_VERSION=2.32.0 AC_SUBST(GLIB_MIN_VERSION) # GLib checks; we require GLib $GLIB_MIN_VERSION or later, and require gmodule # support, as we need that for dynamically loading plugins.