X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcitadel.h;h=c74bef1a6f9d9ca319c3656be3d26911ecc9279a;hb=a2fda4eafb51bbf58c04471522aa2d0f116c797e;hp=0e58afd369f7b81e8f2a57182e9878494ab85707;hpb=35707bd874630d38fb1b9d13fd0ad5e73c121217;p=citadel.git

diff --git a/citadel/citadel.h b/citadel/citadel.h
index 0e58afd36..c74bef1a6 100644
--- a/citadel/citadel.h
+++ b/citadel/citadel.h
@@ -11,15 +11,6 @@
 #define CITADEL_H
 /* #include <dmalloc.h> uncomment if using dmalloc */
 
-/* Build Citadel with the calendar service only if the header *and*
- * library for libical are both present.
- */
-#ifdef HAVE_LIBICAL
-#ifdef HAVE_ICAL_H
-#define CITADEL_WITH_CALENDAR_SERVICE 1
-#endif
-#endif
-
 #include "sysdep.h"
 #include <limits.h>
 #include "sysconfig.h"
@@ -47,10 +38,10 @@ extern "C" {
  * usually more strict because you're not really supposed to dump/load and
  * upgrade at the same time.
  */
-#define REV_LEVEL	730		/* This version */
+#define REV_LEVEL	732		/* This version */
 #define REV_MIN		591		/* Oldest compatible database */
 #define EXPORT_REV_MIN	725		/* Oldest compatible export files */
-#define LIBCITADEL_MIN	104		/* Minimum required version of libcitadel */
+#define LIBCITADEL_MIN	109		/* Minimum required version of libcitadel */
 
 #define SERVER_TYPE 0			/* zero for stock Citadel; other developers please
 					   obtain SERVER_TYPE codes for your implementations */
@@ -276,7 +267,7 @@ enum {
 #define FILTERLIST	"application/x-citadel-filter-list"
 #define SIEVECONFIG	"application/x-citadel-sieve-config"
 
-#define TRACE	lprintf(CTDL_DEBUG, "Checkpoint: %s, %d\n", __FILE__, __LINE__)
+#define TRACE	CtdlLogPrintf(CTDL_DEBUG, "Checkpoint: %s, %d\n", __FILE__, __LINE__)
 
 #ifndef LONG_MAX
 #define LONG_MAX 2147483647L