** Fixes part of bug #545558

2008-07-31  Matthew Barnes  <mbarnes@redhat.com>

	** Fixes part of bug #545558

	* configure.in:
	Add an --enable-hula configure option for building the Hula
        Camel provider, disabled by default.

	* camel/providers/Makefile.am:
	Disable the Hula provider unless --enable-hula was given at
	configure-time.

svn path=/trunk/; revision=9243

diff --git a/ChangeLog b/ChangeLog
index 0e03da3..167c651 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-07-31  Matthew Barnes  <mbarnes@redhat.com>
+
+       ** Fixes part of bug #545558
+
+       * configure.in:
+       Add an --enable-hula configure option for building the Hula Camel
+       provider, disabled by default.
+
 2008-07-23  Johnny Jacob  <jjohnny@novell.com>
 
        * configure.in (API_VERSION): libcamel version bumped.

diff --git a/camel/ChangeLog b/camel/ChangeLog
index 09d2eef..90e5276 100644 (file)
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,11 @@
+2008-07-31  Matthew Barnes  <mbarnes@redhat.com>
+
+       ** Fixes part of bug #545558
+
+       * providers/Makefile.am:
+       Disable the Hula provider unless --enable-hula was given at
+       configure-time.
+
 2008-07-31  Srinivasa Ragavan  <sragavan@novell.com>
 
        * camel/camel-folder-search.c: Revamp search and make body search as

diff --git a/camel/providers/Makefile.am b/camel/providers/Makefile.am
index bbd2139..3e48856 100644 (file)
--- a/camel/providers/Makefile.am
+++ b/camel/providers/Makefile.am
@@ -4,6 +4,10 @@ if ENABLE_NNTP
 NNTP_DIR=nntp
 endif
 
+if ENABLE_HULA
+HULA_DIR=hula
+endif
+
 if ENABLE_IMAPP
 IMAPP_DIR=imapp
 endif
@@ -17,6 +21,6 @@ else
 SENDMAIL_DIR=sendmail
 endif
 
-SUBDIRS = pop3 $(SENDMAIL_DIR) smtp imap $(IMAP4_DIR) $(NNTP_DIR) local $(IMAPP_DIR) groupwise hula
+SUBDIRS = pop3 $(SENDMAIL_DIR) smtp imap $(IMAP4_DIR) $(NNTP_DIR) local $(IMAPP_DIR) groupwise $(HULA_DIR)
 
 

diff --git a/configure.in b/configure.in
index b01cb39..a7a0821 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1046,6 +1046,22 @@ else
          msg_imap4=no   
 fi      
 AM_CONDITIONAL(ENABLE_IMAP4, test x$enable_imap4 = xyes)
+
+dnl **************************************************
+dnl Hula support
+dnl **************************************************
+AC_ARG_ENABLE(hula,
+  AC_HELP_STRING( [--enable-hula=@<:@no/yes@:>@],
+                  [Enable support for the now-defunct Hula project]),
+  ,enable_hula=no)
+
+if test "x$enable_hula" = "xyes"; then
+        AC_DEFINE(ENABLE_HULA,1,[Build Hula backend])
+        msg_hula=yes
+else
+        msg_hula=no
+fi
+AM_CONDITIONAL(ENABLE_HULA, test x$enable_hula = xyes)
  
 dnl **************************************************
 dnl * File locking
@@ -1765,6 +1781,10 @@ if test "$msg_nntp" = "yes"; then
 echo "\
        NNTP support:     $msg_nntp"
 fi
+if test "$msg_hula" = "yes"; then
+echo "\
+       Hula support:     $msg_hula"
+fi
 echo "\
        Kerberos 4/5:     $msg_krb4/$msg_krb5
        Gnome Keyring:    $enable_gnome_keyring/$with_gnome_keyring