aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNat Friedman <nat@src.gnome.org>2004-10-29 05:25:52 +0800
committerNat Friedman <nat@src.gnome.org>2004-10-29 05:25:52 +0800
commitf5e40030fbc93b76fd1fa049a7e11d49db23375c (patch)
treeeda61440848203e11f0e76a90ef04af6442f8e77
parent0ce5576537dbc5108d47cbf64f8ee615d88a651e (diff)
downloadgsoc2013-evolution-f5e40030fbc93b76fd1fa049a7e11d49db23375c.tar.gz
gsoc2013-evolution-f5e40030fbc93b76fd1fa049a7e11d49db23375c.tar.zst
gsoc2013-evolution-f5e40030fbc93b76fd1fa049a7e11d49db23375c.zip
Re-enable BBDB.
svn path=/trunk/; revision=27761
-rw-r--r--ChangeLog4
-rw-r--r--configure.in3
-rw-r--r--plugins/bbdb/Makefile.am6
3 files changed, 6 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index d516b88524..d2c44edabb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-28 Nat Friedman <nat@novell.com>
+
+ * configure.in: Re-enable bbwhatever becuase I think it works now.
+
2004-10-27 JP Rosevear <jpr@novell.com>
* configure.in: revive E_WIDGETS_CFLAGS/LIBS because of needing to
diff --git a/configure.in b/configure.in
index 40825c2cc3..90b2662c9b 100644
--- a/configure.in
+++ b/configure.in
@@ -1340,7 +1340,7 @@ AC_SUBST_FILE(EVO_PLUGIN_RULE)
AC_ARG_ENABLE(plugins, [ --enable-plugins=[no/all/list] Enable plugins.],enable_plugins="$enableval",enable_plugins=no)
dnl Add any new plugins here
-plugins_all="subject-thread save-attachments prefer-plain save-calendar select-one-source copy-tool mail-to-task folder-unsubscribe mark-calendar-offline audio-inline"
+plugins_all="bbdb subject-thread save-attachments prefer-plain save-calendar select-one-source copy-tool mail-to-task folder-unsubscribe mark-calendar-offline audio-inline"
if test x"$enable_plugins" = "xno"; then
plugins_enabled=""
@@ -1549,6 +1549,7 @@ mail/default/Makefile
mail/default/C/Makefile
mail/importers/Makefile
plugins/Makefile
+plugins/bbdb/Makefile
plugins/audio-inline/Makefile
plugins/mail-to-task/Makefile
plugins/subject-thread/Makefile
diff --git a/plugins/bbdb/Makefile.am b/plugins/bbdb/Makefile.am
index 7163305da4..6691f1cf9e 100644
--- a/plugins/bbdb/Makefile.am
+++ b/plugins/bbdb/Makefile.am
@@ -10,9 +10,3 @@ plugin_LTLIBRARIES = liborg-gnome-evolution-bbdb.la
liborg_gnome_evolution_bbdb_la_SOURCES = bbdb.c gaimbuddies.c
liborg_gnome_evolution_bbdb_la_LDFLAGS = -module -avoid-version
-
-# noinst_PROGRAMS = test-evobuddy
-
- #test_evobuddy_LDADD = $(top_builddir)/camel/libcamel.la $(EVOLUTION_ADDRESSBOOK_LIBS) $(EVOLUTION_MAIL_LIBS) $(CAMEL_LIBS)
- #test_evobuddy_SOURCES = test-evobuddy.c gaimbuddies.c bbdb.c
- #test_evobuddy_INCLUDES = $(INCLUDES)