diff options
| author |  Brendan Taylor <whateley@gmail.com> | 2011-10-30 18:46:08 +0000 |
|---|---|---|
| committer | Brendan Taylor <whateley@gmail.com> | 2011-10-30 18:46:08 +0000 |
| commit | 8315dbfe77cef9f0592eb412b0b122c5a73307a8 (patch) | |
| tree | 84f7d22bb9852ff6f8703258ccc602c9911297a4 | |
| parent | 47f84c9c76366da2fefff0fd29d57712c695bc68 (diff) | |
use GLIB_CHECK_VERSION instead of a Makefile hack
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | src/uzbl-core.c | 2 |
2 files changed, 1 insertions, 6 deletions
@@ -21,11 +21,6 @@ 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) diff --git a/src/uzbl-core.c b/src/uzbl-core.c index f756740..c3bc2dd 100644 --- a/src/uzbl-core.c +++ b/src/uzbl-core.c @@ -962,7 +962,7 @@ initialize(int argc, char** argv) { if (uzbl.state.socket_id || uzbl.state.embed) uzbl.state.plug_mode = TRUE; -#ifndef UZBL_GTHREAD_NO_INIT +#if !GLIB_CHECK_VERSION(2, 31, 0) if (!g_thread_supported()) g_thread_init(NULL); #endif |