[evolution-data-server] Bug 622392 - Build failure due to missing nspr includes



commit 1c79f8a68d546f7d83f6e4e60576d602b7d91135
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun Jun 27 07:45:18 2010 -0400

    Bug 622392 - Build failure due to missing nspr includes
    
    camel.pc.in already defines @mozilla_nss@ and @mozilla_nspr@ in its
    Requires list, but that only works for distros that ship their own nss
    and nspr pkg-config files.
    
    Debian, for example, doesn't (but it should).  So @mozilla_nss@ and
    @mozilla_nspr@ are never defined.  Instead, the configure script falls
    back to the older "manual" settings and defines MANUAL_NSS_CFLAGS and
    MANUAL_NSS_LIBS.  So list those as well in camel.pc.in.  They will be
    mutually exclusive with the pkg-config variables.
    
    And please, for the love of free software, somebody push pkg-config
    files to upstream nss/nspr so we can drop this gunk from configure.
    It's 2010 already for cryin' out loud...

 camel/camel.pc.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/camel/camel.pc.in b/camel/camel.pc.in
index 8dc2926..461b6f0 100644
--- a/camel/camel.pc.in
+++ b/camel/camel.pc.in
@@ -10,5 +10,5 @@ Name: camel
 Description: the Evolution MIME message handling library
 Version: @VERSION@
 Requires: glib-2.0 libedataserver- API_VERSION@ sqlite3 @mozilla_nss@ @mozilla_nspr@
-Libs: -L${libdir} -lcamel- API_VERSION@
-Cflags: -I${privincludedir}
+Libs: -L${libdir} -lcamel- API_VERSION@ @MANUAL_NSS_LIBS@
+Cflags: -I${privincludedir} @MANUAL_NSS_CFLAGS@



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]