Bug 256988 firefox pkg-config files reference mozilla-xpcom and mozilla-nspr.

use MOZ_APP_NAME in the pkgconfig files
patch by Christian Persch <chpe@gnome.org> r+a=shaver

build/unix/.cvsignore

@@ -6,4 +6,12 @@ mozilla-gtkmozembed.pc
 mozilla-js.pc
 mozilla-nspr.pc
 mozilla-nss.pc
+mozilla-plugin.pc
 mozilla-xpcom.pc
+firefox-config
+firefox-gtkmozembed.pc
+firefox-js.pc
+firefox-nspr.pc
+firefox-nss.pc
+firefox-plugin.pc
+firefox-xpcom.pc

build/unix/Makefile.in

@@ -88,6 +88,7 @@ $(MOZ_APP_NAME)-%.pc : mozilla-%.pc.in Makefile.in Makefile $(DEPTH)/config/auto
 	-e "s|%includedir%|$(includedir)|" \
 	-e "s|%libdir%|$(mozappdir)|" \
 	-e "s|%idldir%|$(idldir)|" \
+	-e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
 	-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
 	-e "s|%SUPERWIN_LIBS%|$(SUPERWIN_LIBS)|" \
 	-e "s|%DEFS%|$(_DEFS)|" \

build/unix/mozilla-gtkmozembed.pc.in

@@ -1,11 +0,0 @@
-prefix=%prefix%
-exec_prefix=%exec_prefix%
-libdir=%libdir%
-includedir=%includedir%
-
-Name: Mozilla Gtk Embedding Widget
-Description: Mozilla Embedding Widget for Gtk+
-Version: %MOZILLA_VERSION%
-Requires: mozilla-xpcom = %MOZILLA_VERSION%
-Libs: -L${libdir} -lgtkembedmoz %SUPERWIN_LIBS%
-Cflags: -I${includedir}/gtkembedmoz

build/unix/mozilla-js.pc.in

@@ -6,6 +6,6 @@ includedir=%includedir%
 Name: JavaScript
 Description: The Mozilla JavaScript Library
 Version: %MOZILLA_VERSION%
-Requires: mozilla-nspr = %MOZILLA_VERSION%
+Requires: %MOZ_APP_NAME%-nspr = %MOZILLA_VERSION%
 Libs: -L${libdir} -lmozjs
 Cflags: -I${includedir}/js -DXP_UNIX

build/unix/mozilla-nss.pc.in

@@ -6,6 +6,6 @@ includedir=%includedir%
 Name: NSS
 Description: Mozilla Network Security Services
 Version: %MOZILLA_VERSION%
-Requires: mozilla-nspr = %MOZILLA_VERSION%
+Requires: %MOZ_APP_NAME%-nspr = %MOZILLA_VERSION%
 Libs: -L${libdir} -lnss3 -lsmime3 -lssl3 -lsoftokn3
 Cflags: -I${includedir}/nss

build/unix/mozilla-plugin.pc.in

@@ -6,5 +6,5 @@ includedir=%includedir%
 Name: Mozilla Plug-In API
 Description: Mozilla Plug-In API
 Version: %MOZILLA_VERSION%
-Requires: mozilla-xpcom = %MOZILLA_VERSION%
+Requires: %MOZ_APP_NAME%-xpcom = %MOZILLA_VERSION%
 Cflags: -I${includedir}/java -I${includedir}/plugin

build/unix/mozilla-xpcom.pc.in

@@ -7,6 +7,6 @@ idldir=%idldir%
 Name: XPCOM
 Description: The Mozilla Cross Platform Component Library
 Version: %MOZILLA_VERSION%
-Requires: mozilla-nspr = %MOZILLA_VERSION%
+Requires: %MOZ_APP_NAME%-nspr = %MOZILLA_VERSION%
 Libs: -L${libdir} -lxpcom
 Cflags: -I${includedir} -I${includedir}/xpcom -I${includedir}/string