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

@@ -110,8 +110,15 @@ 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)|" \

xulrunner/installer/mozilla-plugin.pc.in

@@ -5,5 +5,4 @@ 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%