diff options
| author | Chris Toshok <toshok@ximian.com> | 2003-10-30 04:16:40 +0800 |
|---|---|---|
| committer | Chris Toshok <toshok@src.gnome.org> | 2003-10-30 04:16:40 +0800 |
| commit | 02af33ab9c7c6356629fe208aae836f3c844f3a8 (patch) | |
| tree | df865abb018b08227d01c7793df934b1b6e26291 | |
| parent | 302a9b1ed51e68e26c3d15fc6a6daf875fd7febc (diff) | |
| download | gsoc2013-evolution-02af33ab9c7c6356629fe208aae836f3c844f3a8.tar.gz gsoc2013-evolution-02af33ab9c7c6356629fe208aae836f3c844f3a8.tar.zst gsoc2013-evolution-02af33ab9c7c6356629fe208aae836f3c844f3a8.zip | |
ifdef the smime code with HAVE_NSS.
2003-10-29 Chris Toshok <toshok@ximian.com>
* gui/component/component-factory.c (factory): ifdef the smime
code with HAVE_NSS.
* gui/component/Makefile.am (libevolution_addressbook_la_LIBADD):
conditionally include libevolution-smime.la.
svn path=/trunk/; revision=23124
| -rw-r--r-- | addressbook/ChangeLog | 8 | ||||
| -rw-r--r-- | addressbook/gui/component/Makefile.am | 6 | ||||
| -rw-r--r-- | addressbook/gui/component/component-factory.c | 5 |
3 files changed, 17 insertions, 2 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index b939e5a41d..6f4e4148c0 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,11 @@ +2003-10-29 Chris Toshok <toshok@ximian.com> + + * gui/component/component-factory.c (factory): ifdef the smime + code with HAVE_NSS. + + * gui/component/Makefile.am (libevolution_addressbook_la_LIBADD): + conditionally include libevolution-smime.la. + 2003-10-24 Dan Winship <danw@ximian.com> * backend/pas/Makefile.am (libpas_la_LIBADD): libpas should depend diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am index bf9064a132..0e16c5ac92 100644 --- a/addressbook/gui/component/Makefile.am +++ b/addressbook/gui/component/Makefile.am @@ -41,8 +41,12 @@ libevolution_addressbook_la_SOURCES = \ # $(top_builddir)/addressbook/printing/libecontactprint.la +if ENABLE_SMIME +SMIME_LIB=$(top_builddir)/smime/gui/libevolution-smime.la +endif + libevolution_addressbook_la_LIBADD = \ - $(top_builddir)/smime/gui/libevolution-smime.la \ + $(SMIME_LIB) \ $(top_builddir)/addressbook/gui/component/select-names/libeselectnames.la \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/addressbook/gui/merging/libeabbookmerging.la \ diff --git a/addressbook/gui/component/component-factory.c b/addressbook/gui/component/component-factory.c index a79db23fc0..573e0c1bb1 100644 --- a/addressbook/gui/component/component-factory.c +++ b/addressbook/gui/component/component-factory.c @@ -29,8 +29,9 @@ #include "eab-popup-control.h" #include "eab-vcard-control.h" #include "select-names/e-select-names-bonobo.h" +#if HAVE_NSS #include "smime/gui/certificate-manager.h" - +#endif #include <bonobo/bonobo-shlib-factory.h> @@ -67,8 +68,10 @@ factory (BonoboGenericFactory *factory, return BONOBO_OBJECT (addressbook_config_control_new ()); if (strcmp (component_id, SELECT_NAMES_ID) == 0) return BONOBO_OBJECT (e_select_names_bonobo_new ()); +#if HAVE_NSS if (strcmp (component_id, CERTIFICATE_MANAGER_CONFIG_CONTROL_ID) == 0) return BONOBO_OBJECT (certificate_manager_config_control_new ()); +#endif g_warning (FACTORY_ID ": Don't know what to do with %s", component_id); return NULL; |