Bug 34490 - Add nss/nspr package names to pkgconfig requirements

This only works on distros that provide pkgconfig files for libnss and
libnspr, which by now I would hope is all distros.

diff --git a/camel/camel.pc.in b/camel/camel.pc.in
index d37c509..e5d9f88 100644 (file)
--- a/camel/camel.pc.in
+++ b/camel/camel.pc.in
@@ -9,6 +9,6 @@ privincludedir=@privincludedir@
 Name: camel
 Description: the Evolution MIME message handling library
 Version: @VERSION@
-Requires: glib-2.0, libedataserver-@API_VERSION@, sqlite3
+Requires: glib-2.0, libedataserver-@API_VERSION@, sqlite3, @mozilla_nss@, @mozilla_nspr@
 Libs: -L${libdir} -lcamel-@API_VERSION@
 Cflags: -I${privincludedir}

diff --git a/configure.ac b/configure.ac
index d6ad1ad..8818ab0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -671,6 +671,10 @@ fi
 
 AM_CONDITIONAL(ENABLE_SMIME, test "x$msg_smime" != "xno")
 
+dnl For pkgconfig files.
+AC_SUBST(mozilla_nss)
+AC_SUBST(mozilla_nspr)
+
 AC_SUBST(MANUAL_NSPR_CFLAGS)
 AC_SUBST(MANUAL_NSPR_LIBS)
 AC_SUBST(MANUAL_NSS_CFLAGS)

diff --git a/evolution-data-server.pc.in b/evolution-data-server.pc.in
index e656f9c..4224365 100644 (file)
--- a/evolution-data-server.pc.in
+++ b/evolution-data-server.pc.in
@@ -15,4 +15,4 @@ execversion=@BASE_VERSION@
 Name: evolution-data-server
 Description: The evolution data server for the calendar and addressbook
 Version: @VERSION@
-Requires: dbus-glib-1
+Requires: dbus-glib-1, @mozilla_nss@, @mozilla_nspr@