Plugin pkgconfig update, remove nspr dependency, define XP_UNIX for NPAPI headers, define OJI when it is available. b=453883 b=480887 r=bsmedberg
authorJosh Aas <joshmoz@gmail.com>
Wed, 18 Mar 2009 11:20:14 -0700
changeset 26314 4bb6d29863d0634c292fc0efee6053c6c33bd6da
parent 26313 6e6d0d7d5e55e3e13087558bcdadf5e49af259f9
child 26315 14e59192bfeb8f3c8ccc847f0379d908e35169ef
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg
bugs453883, 480887
milestone1.9.2a1pre
Plugin pkgconfig update, remove nspr dependency, define XP_UNIX for NPAPI headers, define OJI when it is available. b=453883 b=480887 r=bsmedberg
xulrunner/installer/Makefile.in
xulrunner/installer/mozilla-plugin.pc.in
--- a/xulrunner/installer/Makefile.in
+++ b/xulrunner/installer/Makefile.in
@@ -105,18 +105,25 @@ NSPR_VERSION=$(shell $(DEPTH)/nsprpub/co
 endif
 
 $(warning FULL_NSPR_CFLAGS=$(FULL_NSPR_CFLAGS))
 
 ifndef MOZ_NATIVE_NSS
 pkg_config_files += mozilla-nss.pc
 endif
 
+ifdef MOZ_OJI
+OJIDEF=-DOJI
+else
+OJIDEF=
+endif
+
 %.pc: $(srcdir)/%.pc.in $(GLOBAL_DEPS)
 	cat $< | sed \
+	-e "s|%ojidef%|$(OJIDEF)|" \
 	-e "s|%prefix%|$(prefix)|" \
 	-e "s|%includedir%|$(includedir)|" \
 	-e "s|%idldir%|$(idldir)|" \
 	-e "s|%sdkdir%|$(sdkdir)|" \
 	-e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
 	-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
 	-e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \
 	-e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \
--- a/xulrunner/installer/mozilla-plugin.pc.in
+++ b/xulrunner/installer/mozilla-plugin.pc.in
@@ -1,9 +1,8 @@
 prefix=%prefix%
 sdkdir=%sdkdir%
 includedir=%includedir%
 
 Name: Mozilla Plug-In API
 Description: Mozilla Plug-In API
 Version: %MOZILLA_VERSION%
-Requires: %NSPR_NAME% >= %NSPR_VERSION%
-Cflags: -I${includedir}/stable
+Cflags: -I${includedir}/stable -DXP_UNIX %ojidef%