Attachment #79911 for bug #116231




prefix		= @prefix@
exec_prefix	= @exec_prefix@
bindir		= @bindir@
includedir	= $(mozappdir)/include
libdir		= @libdir@
datadir		= @datadir@
mandir		= @mandir@
idldir		= $(mozappdir)/idl

mozappdir	= $(libdir)/$(MOZ_APP_NAME)
mredir		= $(libdir)/mre/mre-$(MOZ_APP_VERSION)
mrelibdir	= $(mredir)/lib





NSPR_VERSION=$(shell $(DEPTH)/nsprpub/config/nspr-config --version)
endif

# Hack to make sure that mozilla-nss.pc has the proper nss dependencies
ifdef MOZ_NATIVE_NSS
FULL_NSS_CFLAGS=$(shell $(NSS_CONFIG) --cflags)
FULL_NSS_LIBS=$(shell $(NSS_CONFIG) --libs)
NSS_NAME=nss
NSS_VERSION=$(shell $(NSS_CONFIG) --version)
else
FULL_NSS_CFLAGS=-I$(includedir)/nss
FULL_NSS_LIBS=-L$(mozappdir)/nss -lnss3 -lsmime3 -lssl3 -lsoftokn3
NSS_NAME=$(MOZ_APP_NAME)-nss
NSS_VERSION=$(MOZ_APP_VERSION)
endif

ifdef MOZ_ENABLE_GTK
SUPERWIN_LIBS=-lgtksuperwin
endif

	-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
	-e "s|%DEFS%|$(_DEFS)|" \
	-e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \
	-e 's|%FULL_NSPR_CFLAGS%|$(FULL_NSPR_CFLAGS)|' \
	-e 's|\(echo -L.*\)\($$\)|\1 -Wl,-R$(mozappdir)\2|' > $@

$(MOZ_APP_NAME)-%.pc : mozilla-%.pc.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
	cat $< | sed \

	-e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \
	-e "s|%FULL_NSPR_CFLAGS%|$(FULL_NSPR_CFLAGS)|" \
	-e "s|%NSPR_NAME%|$(NSPR_NAME)|" \
	-e "s|%NSPR_VERSION%|$(NSPR_VERSION)|" \
	-e "s|%FULL_NSS_LIBS%|$(FULL_NSS_LIBS)|" \
	-e "s|%FULL_NSS_CFLAGS%|$(FULL_NSS_CFLAGS)|" \
	-e "s|%NSS_NAME%|$(NSS_NAME)|" \
	-e "s|%NSS_VERSION%|$(NSS_VERSION)|" \
	-e "s|\(^Libs: -L.*\)|\1 -Wl,-R\$$\{libdir}|" > $@

libs:: $(MOZ_APP_NAME)-config
	chmod 755 $<

Lines 6-11 Link Here

(-)mozilla/build/unix/mozilla-js.pc.in.orig (-1 / +1 lines)
6	Name: JavaScript	6	Name: JavaScript
7	Description: The Mozilla JavaScript Library	7	Description: The Mozilla JavaScript Library
8	Version: %MOZILLA_VERSION%	8	Version: %MOZILLA_VERSION%
9	Requires: %NSPR_NAME% >= %NSPR_VERSION%	9	Requires: %MOZ_APP_NAME%-%NSPR_NAME% >= %NSPR_VERSION%
10	Libs: -L${libdir} -lmozjs	10	Libs: -L${libdir} -lmozjs
11	Cflags: -I${includedir}/js -DXP_UNIX	11	Cflags: -I${includedir}/js -DXP_UNIX




prefix=%prefix%
exec_prefix=%exec_prefix%
libdir=%libdir%
includedir=%includedir%

Name: NSPR
Description: The Netscape Portable Runtime
Version: %NSPR_VERSION%
Requires: %NSPR_NAME% >= %NSPR_VERSION%
Cflags: %FULL_NSPR_CFLAGS%



Lines 7-12 Link Here

(-)mozilla/build/unix/mozilla-xpcom.pc.in.orig (-1 / +1 lines)
7	Name: XPCOM	7	Name: XPCOM
8	Description: The Mozilla Cross Platform Component Library	8	Description: The Mozilla Cross Platform Component Library
9	Version: %MOZILLA_VERSION%	9	Version: %MOZILLA_VERSION%
10	Requires: %NSPR_NAME% >= %NSPR_VERSION%	10	Requires: %MOZ_APP_NAME%-%NSPR_NAME% >= %NSPR_VERSION%
11	Libs: -L${libdir} -lxpcom	11	Libs: -L${libdir} -lxpcom
12	Cflags: -I${includedir} -I${includedir}/xpcom -I${includedir}/string	12	Cflags: -I${includedir} -I${includedir}/xpcom -I${includedir}/string

Lines 1-11 Link Here

(-)mozilla/build/unix/mozilla-nss.pc.in.orig (-9 / +2 lines)
1	prefix=%prefix%
2	exec_prefix=%exec_prefix%
3	libdir=%libdir%
4	includedir=%includedir%
5
6	Name: NSS	1	Name: NSS
7	Description: Mozilla Network Security Services	2	Description: Mozilla Network Security Services
8	Version: %MOZILLA_VERSION%	3	Version: %NSS_VERSION%
9	Requires: %NSPR_NAME% >= %NSPR_VERSION%	4	Requires: %NSS_NAME% >= %NSS_VERSION%
10	Libs: -L${libdir} -lnss3 -lsmime3 -lssl3 -lsoftokn3
11	Cflags: -I${includedir}/nss

Return to bug 116231

Lines 54-66 Link Here

(-)mozilla/config/autoconf.mk.in (-3 / +3 lines)
54	prefix = @prefix@	54	prefix = @prefix@
55	exec_prefix = @exec_prefix@	55	exec_prefix = @exec_prefix@
56	bindir = @bindir@	56	bindir = @bindir@
57	includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)	57	includedir = $(mozappdir)/include
58	libdir = @libdir@	58	libdir = @libdir@
59	datadir = @datadir@	59	datadir = @datadir@
60	mandir = @mandir@	60	mandir = @mandir@
61	idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)	61	idldir = $(mozappdir)/idl
62		62
63	mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)	63	mozappdir = $(libdir)/$(MOZ_APP_NAME)
64	mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION)	64	mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION)
65	mrelibdir = $(mredir)/lib	65	mrelibdir = $(mredir)/lib
66		66

Lines 61-66 Link Here

(-)mozilla/build/unix/Makefile.in (-2 / +21 lines)
61	NSPR_VERSION=$(shell $(DEPTH)/nsprpub/config/nspr-config --version)	61	NSPR_VERSION=$(shell $(DEPTH)/nsprpub/config/nspr-config --version)
62	endif	62	endif
63		63
		64	# Hack to make sure that mozilla-nss.pc has the proper nss dependencies
		65	ifdef MOZ_NATIVE_NSS
		66	FULL_NSS_CFLAGS=$(shell $(NSS_CONFIG) --cflags)
		67	FULL_NSS_LIBS=$(shell $(NSS_CONFIG) --libs)
		68	NSS_NAME=nss
		69	NSS_VERSION=$(shell $(NSS_CONFIG) --version)
		70	else
		71	FULL_NSS_CFLAGS=-I$(includedir)/nss
		72	FULL_NSS_LIBS=-L$(mozappdir)/nss -lnss3 -lsmime3 -lssl3 -lsoftokn3
		73	NSS_NAME=$(MOZ_APP_NAME)-nss
		74	NSS_VERSION=$(MOZ_APP_VERSION)
		75	endif
		76
64	ifdef MOZ_ENABLE_GTK	77	ifdef MOZ_ENABLE_GTK
65	SUPERWIN_LIBS=-lgtksuperwin	78	SUPERWIN_LIBS=-lgtksuperwin
66	endif	79	endif
Lines 82-88 Link Here
82	-e "s\|%MOZILLA_VERSION%\|$(MOZ_APP_VERSION)\|" \	82	-e "s\|%MOZILLA_VERSION%\|$(MOZ_APP_VERSION)\|" \
83	-e "s\|%DEFS%\|$(_DEFS)\|" \	83	-e "s\|%DEFS%\|$(_DEFS)\|" \
84	-e "s\|%FULL_NSPR_LIBS%\|$(FULL_NSPR_LIBS)\|" \	84	-e "s\|%FULL_NSPR_LIBS%\|$(FULL_NSPR_LIBS)\|" \
85	-e "s\|%FULL_NSPR_CFLAGS%\|$(FULL_NSPR_CFLAGS)\|" > $@	85	-e 's\|%FULL_NSPR_CFLAGS%\|$(FULL_NSPR_CFLAGS)\|' \
		86	-e 's\|\(echo -L.*\)\($$\)\|\1 -Wl,-R$(mozappdir)\2\|' > $@
86		87
87	$(MOZ_APP_NAME)-%.pc : mozilla-%.pc.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk	88	$(MOZ_APP_NAME)-%.pc : mozilla-%.pc.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
88	cat $< \| sed \	89	cat $< \| sed \
Lines 99-105 Link Here
99	-e "s\|%FULL_NSPR_LIBS%\|$(FULL_NSPR_LIBS)\|" \	112	-e "s\|%FULL_NSPR_LIBS%\|$(FULL_NSPR_LIBS)\|" \
100	-e "s\|%FULL_NSPR_CFLAGS%\|$(FULL_NSPR_CFLAGS)\|" \	113	-e "s\|%FULL_NSPR_CFLAGS%\|$(FULL_NSPR_CFLAGS)\|" \
101	-e "s\|%NSPR_NAME%\|$(NSPR_NAME)\|" \	114	-e "s\|%NSPR_NAME%\|$(NSPR_NAME)\|" \
102	-e "s\|%NSPR_VERSION%\|$(NSPR_VERSION)\|" > $@	115	-e "s\|%NSPR_VERSION%\|$(NSPR_VERSION)\|" \
		116	-e "s\|%FULL_NSS_LIBS%\|$(FULL_NSS_LIBS)\|" \
		117	-e "s\|%FULL_NSS_CFLAGS%\|$(FULL_NSS_CFLAGS)\|" \
		118	-e "s\|%NSS_NAME%\|$(NSS_NAME)\|" \
		119	-e "s\|%NSS_VERSION%\|$(NSS_VERSION)\|" \
		120	-e "s\|\(^Libs: -L.*\)\|\1 -Wl,-R\$$\{libdir}\|" > $@
103		121
104	libs:: $(MOZ_APP_NAME)-config	122	libs:: $(MOZ_APP_NAME)-config
105	chmod 755 $<	123	chmod 755 $<

Lines 1-12 Link Here

(-)mozilla/build/unix/mozilla-nspr.pc.in.orig (-8 / +1 lines)
1	prefix=%prefix%
2	exec_prefix=%exec_prefix%
3	libdir=%libdir%
4	includedir=%includedir%
5
6	Name: NSPR	1	Name: NSPR
7	Description: The Netscape Portable Runtime	2	Description: The Netscape Portable Runtime
8	Version: %NSPR_VERSION%	3	Version: %NSPR_VERSION%
9	Libs: %FULL_NSPR_LIBS%	4	Requires: %NSPR_NAME% >= %NSPR_VERSION%
10	Cflags: %FULL_NSPR_CFLAGS%
11
12		5