[evolution] Ensure "pkcs12.h" is the mozilla-nss one and not the gnutls one

[Tor Lillqvist <tml src gnome org>]

commit c8b9dd726262a5fcaff7085fc642298c03fa4782
Author: Tor Lillqvist <tml iki fi>
Date:   Wed Nov 11 15:34:28 2009 +0200

    Ensure "pkcs12.h" is the mozilla-nss one and not the gnutls one
    
    Put the Mozilla NSS CFLAGS before the GnuTLS ones in CERT_UI_CFLAGS.
    Also, drop unnecessary EVOLUTION_ADDRESSBOOK_CFLAGS in
    smime/lib/Makefile.am.

 configure.ac          |   11 ++++++++++-
 smime/lib/Makefile.am |    1 -
 2 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index a9a91f7..f545ee3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1243,7 +1243,16 @@ fi
 dnl ******************************
 dnl CERT_UI Flags
 dnl ******************************
-EVO_SET_COMPILE_FLAGS(CERT_UI, libedataserverui-$EDS_PACKAGE libglade-2.0 gthread-2.0, $MANUAL_NSS_CFLAGS $MOZILLA_NSS_CFLAGS, $MOZILLA_L_DIR $MANUAL_NSS_LIBS $MOZILLA_NSS_LIBS)
+dnl
+dnl Here we want the Mozilla flags to go *before* the other ones,
+dnl especially the mozilla-nss -I flags to go before the gnutls ones
+dnl (which are dragged in through libedataserverui), as both
+dnl gnutls and mozilla-nss have a header called "pkcs12.h" which is
+dnl included in smime/lib/e-pkcs12.c. It wants the Mozilla NSS one.
+dnl
+EVO_SET_COMPILE_FLAGS(CERT_UI, libedataserverui-$EDS_PACKAGE libglade-2.0 gthread-2.0)
+CERT_UI_CFLAGS="$MANUAL_NSS_CFLAGS $MOZILLA_NSS_CFLAGS $CERT_UI_CFLAGS"
+CERT_UI_LIBS="$MOZILLA_L_DIR $MANUAL_NSS_LIBS $MOZILLA_NSS_LIBS $CERT_UI_LIBS"
 AC_SUBST(CERT_UI_CFLAGS)
 AC_SUBST(CERT_UI_LIBS)
 
diff --git a/smime/lib/Makefile.am b/smime/lib/Makefile.am
index 1ea8a30..c2c6772 100644
--- a/smime/lib/Makefile.am
+++ b/smime/lib/Makefile.am
@@ -13,7 +13,6 @@ libessmime_la_CPPFLAGS =				\
 	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
 	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"	\
 	-DPREFIX=\""$(prefix)"\"			\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)			\
 	$(CERT_UI_CFLAGS)
 
 libessmime_la_SOURCES = 	\