From 2afb6c01b3bda057add97b20018656142b79cc1b Mon Sep 17 00:00:00 2001
From: "wtc%google.com" <wtc%google.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 18 May 2012 22:26:17 +0000
Subject: [PATCH] Bug 290726: Ship a nspr.pc file when doing make install.  The
 patch is contributed by Mike Hommey <mh+mozilla@glandium.org>.  r=wtc.
 Modified Files: configure configure.in config/Makefile.in Added Files:
 nspr.pc.in

git-svn-id: svn://10.0.0.236/trunk@263840 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/nsprpub/config/Makefile.in |  6 +++++-
 mozilla/nsprpub/config/nspr.pc.in  | 10 ++++++++++
 mozilla/nsprpub/configure          |  1 +
 mozilla/nsprpub/configure.in       |  1 +
 4 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 mozilla/nsprpub/config/nspr.pc.in

diff --git a/mozilla/nsprpub/config/Makefile.in b/mozilla/nsprpub/config/Makefile.in
index 7f7d71f9d21..8557f3ea379 100644
--- a/mozilla/nsprpub/config/Makefile.in
+++ b/mozilla/nsprpub/config/Makefile.in
@@ -20,7 +20,7 @@ VISIBILITY_FLAGS =
 
 # autoconf.mk must be deleted last (from the top-level directory)
 # because it is included by every makefile.
-DIST_GARBAGE	= nsprincl.mk nsprincl.sh nspr-config
+DIST_GARBAGE	= nsprincl.mk nsprincl.sh nspr-config nspr.pc
 
 RELEASE_BINS	= nspr-config
 
@@ -118,3 +118,7 @@ $(OBJDIR)/%$(PROG_SUFFIX): $(OBJDIR)/%.$(OBJ_SUFFIX)
 install:: nspr.m4
 	$(NSINSTALL) -D $(DESTDIR)$(datadir)/aclocal
 	$(NSINSTALL) -t -m 0644 $< $(DESTDIR)$(datadir)/aclocal
+
+install:: nspr.pc
+	$(NSINSTALL) -D $(DESTDIR)$(libdir)/pkgconfig
+	$(NSINSTALL) -t -m 0644 $< $(DESTDIR)$(libdir)/pkgconfig
diff --git a/mozilla/nsprpub/config/nspr.pc.in b/mozilla/nsprpub/config/nspr.pc.in
new file mode 100644
index 00000000000..86300a0d578
--- /dev/null
+++ b/mozilla/nsprpub/config/nspr.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: NSPR
+Description: The Netscape Portable Runtime
+Version: @MOD_MAJOR_VERSION@.@MOD_MINOR_VERSION@.@MOD_PATCH_VERSION@
+Libs: -L@libdir@ -lplds@MOD_MAJOR_VERSION@ -lplc@MOD_MAJOR_VERSION@ -lnspr@MOD_MAJOR_VERSION@
+Cflags: -I@includedir@
diff --git a/mozilla/nsprpub/configure b/mozilla/nsprpub/configure
index 4dc2ab21f30..3bc3f8a8c03 100755
--- a/mozilla/nsprpub/configure
+++ b/mozilla/nsprpub/configure
@@ -6662,6 +6662,7 @@ MAKEFILES="
     config/nsprincl.mk
     config/nsprincl.sh
     config/nspr-config
+    config/nspr.pc
     lib/Makefile
     lib/ds/Makefile
     lib/libc/Makefile
diff --git a/mozilla/nsprpub/configure.in b/mozilla/nsprpub/configure.in
index 6fdb58edf4c..8e58c28247a 100644
--- a/mozilla/nsprpub/configure.in
+++ b/mozilla/nsprpub/configure.in
@@ -3299,6 +3299,7 @@ MAKEFILES="
     config/nsprincl.mk
     config/nsprincl.sh
     config/nspr-config
+    config/nspr.pc
     lib/Makefile
     lib/ds/Makefile
     lib/libc/Makefile