[pan2] a few fixes.... disabled dbus for now, needs debugging.

[Heinrich MÃller <henmull src gnome org>]

commit 98ffa6255baeb27502315bcc8d31221e064ba4d7
Author: Heinrich MÃller <henmull src gnome org>
Date:   Sun Jan 22 10:00:23 2012 +0100

    a few fixes....
    disabled dbus for now, needs debugging.

 configure.in         |   36 ++++--------------------------------
 pan/data/Makefile.am |    8 +++++---
 pan/data/article.cc  |    5 +++++
 3 files changed, 14 insertions(+), 35 deletions(-)
---
diff --git a/configure.in b/configure.in
index 5be40f0..2af7627 100644
--- a/configure.in
+++ b/configure.in
@@ -57,9 +57,6 @@ ENCHANT_REQUIRED=1.6.0
 GNUTLS_REQUIRED=2.12.10
 LIBNOTIFY_REQUIRED=0.4.1
 LIBGKR_REQUIRED=3.2.2
-ODB_REQUIRED=1.7.0
-SQLITE3_REQUIRED=3.7.0
-AC_SUBST(ODB_REQUIRED)
 AC_SUBST(GLIB_REQUIRED)
 AC_SUBST(GMIME_REQUIRED)
 AC_SUBST(GTK_REQUIRED)
@@ -67,7 +64,6 @@ AC_SUBST(GTKSPELL_REQUIRED)
 AC_SUBST(GNUTLS_REQUIRED)
 AC_SUBST(LIBNOTIFY_REQUIRED)
 AC_SUBST(LIBGKR_REQUIRED)
-AC_SUBST(SQLITE3_REQUIRED)
 
 dnl LIBGSASL_REQUIRED=1.6.1
 dnl AC_SUBST(LIBGSASL_REQUIRED)
@@ -120,10 +116,10 @@ if test "x$want_gmime_crypto" = "xyes" ; then
 fi
 
 
-AC_ARG_WITH(dbus, AC_HELP_STRING([--with-dbus], [Enable DBUS support]), [want_dbus=$withval], [want_dbus=yes])
-if test "x$want_dbus" = "xyes" ; then
-  AC_DEFINE(HAVE_DBUS,[1],[DBUS support for multiple Pan instances])
-fi
+dnl AC_ARG_WITH(dbus, AC_HELP_STRING([--with-dbus], [Enable DBUS support]), [want_dbus=$withval], [want_dbus=yes])
+dnl if test "x$want_dbus" = "xyes" ; then
+dnl   AC_DEFINE(HAVE_DBUS,[1],[DBUS support for multiple Pan instances])
+dnl fi
 
 gtkspell_msg=no
 AC_ARG_WITH(gtkspell, AC_HELP_STRING([--with-gtkspell], [Enable GtkSpell support]), [want_gtkspell=$withval], [want_gtkspell=yes])
@@ -177,18 +173,6 @@ if test "x$enable_libnotify" = "xyes" ; then
   fi
 fi
 
-dnl check for libgsasl for secure authentication
-dnl AC_ARG_ENABLE([libgsasl],
-dnl AC_HELP_STRING([--enable-libgsasl],[enable libgsasl support]),[enable_libgsasl=$enableval],[enable_libgsasl=yes])
-dnl if test "x$enable_libgsasl" = "xyes" ; then
-  dnl PKG_CHECK_MODULES([LIBGSASL],[libgsasl >= $LIBGSASL_REQUIRED],[HAVE_SASL="yes"],[HAVE_SASL="no"])
-  dnl AC_SUBST([LIBGSASL_CFLAGS])
-  dnl AC_SUBST([LIBGSASL_LIBS])
-  dnl if test "x$HAVE_SASL" = "xyes"; then
-  dnl   AC_DEFINE([HAVE_SASL],[1],[libgsasl for secure authentication])
-  dnl fi
-dnl fi
-
 dnl Check for gnome-keyring if user-enabled for popup notifications
 AC_ARG_ENABLE([gkr],
 AC_HELP_STRING([--enable-gkr],[enable gnome-keyring support]),[enable_gkr=$enableval],[enable_gkr=yes])
@@ -201,18 +185,6 @@ if test "x$enable_gkr" = "xyes" ; then
   fi
 fi
 
-dnl check for odb and libodb-sqlite for database support
-AC_ARG_ENABLE([sqlite-support],
-AC_HELP_STRING([--enable-sqlite-support],[enable sqlite support with libodb]),[enable_sqlite_support=$enableval],[enable_sqlite_support=yes])
-if test "x$enable_sqlite_support" = "xyes" ; then
-  PKG_CHECK_MODULES([LIBODB],[libodb >= ODB_REQUIRED libodb-sqlite >= ODB_REQUIRED sqlite3 >= SQLITE3_REQUIRED],[HAVE_ODB="yes"],[HAVE_ODB="no"])
-  AC_SUBST([LIBODB_CFLAGS])
-  AC_SUBST([LIBODB_LIBS])
-  if test "x$HAVE_ODB" = "xyes"; then
-    AC_DEFINE([HAVE_ODB],[1],[sqlite support with libodb])
-  fi
-fi
-
 dnl Check to see if strftime supports the use of %l and %k
 AC_MSG_CHECKING(for %l and %k support in strftime)
 AC_TRY_RUN([
diff --git a/pan/data/Makefile.am b/pan/data/Makefile.am
index 3e4e34b..51cbbde 100644
--- a/pan/data/Makefile.am
+++ b/pan/data/Makefile.am
@@ -1,5 +1,7 @@
-AM_CPPFLAGS = -I top_srcdir@ @GMIME_CFLAGS@ @GLIB_CFLAGS@ @GTK_CFLAGS@
-LDADD = @GTK_LIBS@
+AM_CPPFLAGS = -I top_srcdir@ @GMIME_CFLAGS@ @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBODB_CFLAGS@
+LDADD = @GTK_LIBS@ @LIBODB_LIBS@
+
+AM_CPPFLAGS += -DDATABASE_SQLITE
 
 #SUBDIRS = decode-test-cache
 
@@ -12,7 +14,7 @@ libdata_a_SOURCES = \
  cert-store.cc \
  data.cc \
  parts.cc \
- xref.cc
+ xref.cc \
 
 noinst_HEADERS = \
  article.h \
diff --git a/pan/data/article.cc b/pan/data/article.cc
index fa07591..9bdb92a 100644
--- a/pan/data/article.cc
+++ b/pan/data/article.cc
@@ -26,6 +26,11 @@
 #include <pan/general/string-view.h>
 #include "article.h"
 
+#ifdef HAVE_ODB
+  #include <odb/database.hxx>
+  #include <odb/transaction.hxx>
+#endif
+
 using namespace pan;
 
 Article :: PartState