Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 02:14:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 594338 - lmozjs is not available in latest xulrunner SDK... but still present in mozilla-js.pc.in. r=khuey a=approval2.0

Browse Source 
--HG--
extra : rebase_source : 564bbbc8c73b63fb215356294e05d44e6835e2df
This commit is contained in:
Oleg Romashin 2010-09-10 11:36:25 -07:00
parent c4973a223c
commit 9959033066
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
xulrunner/installer/Makefile.in
View File

@ -102,6 +102,13 @@ FULL_NSPR_LIBS=$(subst $(prefix),\$${sdkdir},$(shell $(DEPTH)/nsprpub/config/nsp
NSPR_VERSION=$(shell $(DEPTH)/nsprpub/config/nspr-config --version)
endif
MOZ_XUL_LINK = -lxpcomglue_s -lxul -lxpcom
ifdef JS_SHARED_LIBRARY
MOZ_JS_LINK = -lmozjs
else
MOZ_JS_LINK = $(MOZ_XUL_LINK)
endif
$(warning FULL_NSPR_CFLAGS=$(FULL_NSPR_CFLAGS))
ifndef MOZ_NATIVE_NSS
@ -121,6 +128,8 @@ endif
-e "s|%FULL_NSPR_CFLAGS%|$(FULL_NSPR_CFLAGS)|" \
-e "s|%NSPR_NAME%|$(NSPR_NAME)|" \
-e "s|%NSPR_VERSION%|$(NSPR_VERSION)|" > $@
-e "s|%MOZ_XUL_LINK%|$(MOZ_XUL_LINK)|" \
-e "s|%MOZ_JS_LINK%|$(MOZ_JS_LINK)|" \
chmod 644 $@
install:: $(pkg_config_files)

2
xulrunner/installer/libxul.pc.in
View File

@ -7,5 +7,5 @@ Name: libxul
Description: The Mozilla Runtime and Embedding Engine
Version: %MOZILLA_VERSION%
Requires: %NSPR_NAME% >= %NSPR_VERSION%
Libs: -L${sdkdir}/lib -lxpcomglue_s -lxul -lxpcom
Libs: -L${sdkdir}/lib %MOZ_XUL_LINK%
Cflags: -I${includedir} %WCHAR_CFLAGS%

2
xulrunner/installer/mozilla-js.pc.in
View File

@ -6,5 +6,5 @@ Name: JavaScript
Description: The Mozilla JavaScript Library
Version: %MOZILLA_VERSION%
Requires: %NSPR_NAME% >= %NSPR_VERSION%
Libs: -L${sdkdir}/lib -lmozjs
Libs: -L${sdkdir}/lib %MOZ_JS_LINK%
Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE