From 47f84c9c76366da2fefff0fd29d57712c695bc68 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Tue, 25 Oct 2011 14:24:10 -0400 Subject: Check if glib needs g_thread_init Newer glib versions don't need g_thread_init. Of course, there is no announcement or whatever, so you have to go to the docs to discover this. Nevermind the lack of backwards compatibility with a nice message about when it will be removed for a while either. --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 00a8f89..83be153 100644 --- a/Makefile +++ b/Makefile @@ -21,6 +21,11 @@ endif REQ_PKGS += libsoup-2.4 gthread-2.0 glib-2.0 +# Check for a new glib version +ifeq ($(shell pkg-config --exists "glib-2.0 >= 2.31.0" && echo 1),1) + CPPFLAGS += -DUZBL_GTHREAD_NO_INIT +endif + ARCH:=$(shell uname -m) COMMIT_HASH:=$(shell ./misc/hash.sh) -- cgit v1.2.3