diff options
| author | portix <portix@gmx.net> | 2013-06-10 21:33:40 +0200 |
|---|---|---|
| committer | portix <portix@gmx.net> | 2013-06-10 21:33:40 +0200 |
| commit | fc2103d89ffa9e5319cb3a56fa81996069097dbe (patch) | |
| tree | 316284525c74068e834105b933e01ff79f29d641 | |
| parent | 39b7812b5dc216ed070608903d688e002167a4ea (diff) | |
| parent | bc126c86392a618f437a7ebac53590873409dc10 (diff) | |
| download | dwb-fc2103d89ffa9e5319cb3a56fa81996069097dbe.zip | |
Merge branch 'master' of bitbucket.org:portix/dwb
| -rw-r--r-- | config.mk | 12 | ||||
| -rw-r--r-- | scripts/lib/dwb.js | 1 | ||||
| -rw-r--r-- | src/util/Makefile | 2 |
3 files changed, 13 insertions, 2 deletions
@@ -107,8 +107,18 @@ else $(error Cannot find $(GNUTLS)) endif +# >=json-c-0.11 renamed its library, pc file, and include dir +# first check for >=0.11, if it doesn't exist check for <0.11 +ifeq ($(shell pkg-config --exists json-c && echo 1), 1) +JSONC=json-c +else ifeq ($(shell pkg-config --exists json && echo 1), 1) -LIBS+=$(GNUTLS) +JSONC=json +endif +endif + +ifdef JSONC +LIBS+=$(JSONC) else $(error Cannot find json-c) endif diff --git a/scripts/lib/dwb.js b/scripts/lib/dwb.js index 56bb81d6..b779bad9 100644 --- a/scripts/lib/dwb.js +++ b/scripts/lib/dwb.js @@ -912,4 +912,5 @@ }); } })(); + Object.preventExtensions(this); diff --git a/src/util/Makefile b/src/util/Makefile index bfa7ac2a..fc74323c 100644 --- a/src/util/Makefile +++ b/src/util/Makefile @@ -14,7 +14,7 @@ HSTS_PRELOAD=$(BASE_DIR)/$(SRCDIR)/hsts_preload.h TRANSPORT_SECURITY_JSON=transport_security_state_static.json TRANSPORT_SECURITY_CERTS=transport_security_state_static.certs -LIBS=glib-2.0 gnutls json +LIBS=glib-2.0 gnutls $(JSONC) CFLAGS+=$(shell pkg-config --cflags $(LIBS)) LDFLAGS=$(shell pkg-config --libs $(LIBS)) |