ifeq ($(shell pkg-config --atleast-version 1.9 mozilla-gtkmozembed-embedding && echo yes),yes)
moz_name := xulrunner-1.9
moz_pc := mozilla-gtkmozembed-embedding
- moz_cppflags_extra := $(shell pkg-config --cflags xulrunner-nspr)
+ moz_cppflags_extra := $(shell pkg-config --cflags xulrunner-nspr) -DXPCOM_GLUE_USE_NSPR
moz_unstable_cppflags_extra :=
+ moz_ldflags_extra := $(shell pkg-config --libs xulrunner-nspr)
# libxpcomglue needs libdl, but mozilla-gtkmozembed-embedding.pc
# doesn't mention it.
- moz_ldflags_extra := -ldl
+ moz_ldflags_extra += -ldl
else
ifeq ($(shell pkg-config --exists xulrunner-gtkmozembed && echo yes),yes)
moz_name := xulrunner
moz_lib_dir := $(moz_prefix)/lib/$(moz_name)
moz_version := $(shell pkg-config --modversion $(moz_pc))
+# HACK: Replace 'b' for beta with micro=-1
+moz_version := $(subst b,.-1.,$(moz_version))
moz_version_major := $(word 1,$(subst ., ,$(moz_version)))
moz_version_minor := $(word 2,$(subst ., ,$(moz_version)))
moz_version_micro := $(word 3,$(subst ., ,$(moz_version)))