We now look for libical/ical.h instead of ical.h, because

that's where libical's build is putting it now.  If this breaks
your build, please update libical from svn.

diff --git a/citadel/configure.ac b/citadel/configure.ac
index 81e5eae6ac87123400f2446ba94c909c9b0c4c2b..ee2b7bf096244ef03717e643325d82d1d6cba1db 100644 (file)
--- a/citadel/configure.ac
+++ b/citadel/configure.ac
@@ -704,7 +704,7 @@ AC_CHECK_HEADER(curl/curl.h,
 
 
 dnl Checks for the libical iCalendar library.
-AC_CHECK_HEADER(ical.h,
+AC_CHECK_HEADER(libical/ical.h,
        [AC_CHECK_LIB(ical, icalcomponent_new,
                [
                        SERVER_LIBS="-lical $SERVER_LIBS"
@@ -715,7 +715,7 @@ AC_CHECK_HEADER(ical.h,
        ,
        )],
        [
-               AC_MSG_ERROR(ical.h was not found and is required.  More info: http://www.citadel.org/doku.php/installation:start)
+               AC_MSG_ERROR(libical/ical.h was not found and is required.  More info: http://www.citadel.org/doku.php/installation:start)
        ]
 )
 

diff --git a/citadel/ical_dezonify.c b/citadel/ical_dezonify.c
index 662840c41105b81548cf409a139da7a9f5227861..0e95bdc71318f3c9a26fe0ad9dbf0e23f168766c 100644 (file)
--- a/citadel/ical_dezonify.c
+++ b/citadel/ical_dezonify.c
@@ -16,7 +16,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <strings.h>
-#include <ical.h>
+#include <libical/ical.h>
 #include <libcitadel.h>
 #include "citadel.h"
 #include "server.h"

diff --git a/citadel/modules/calendar/serv_calendar.c b/citadel/modules/calendar/serv_calendar.c
index 35e2bbea8b4c48932a6dd548bdf0e84db8a665f3..ae8ae7a78aee1faad7c740fb87d4332b7159c422 100644 (file)
--- a/citadel/modules/calendar/serv_calendar.c
+++ b/citadel/modules/calendar/serv_calendar.c
@@ -19,7 +19,7 @@
 #ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif
-#include <ical.h>
+#include <libical/ical.h>
 #include <libcitadel.h>
 #include "citadel.h"
 #include "server.h"

diff --git a/webcit/configure.ac b/webcit/configure.ac
index bb7663429d0f8a2458942daf5d71acfca51c1d20..7ddfc1323d68bea333da46e0a882e010a9e8f38c 100644 (file)
--- a/webcit/configure.ac
+++ b/webcit/configure.ac
@@ -177,7 +177,7 @@ AC_CHECK_HEADER(libcitadel.h,
 
 
 dnl Checks for the libical iCalendar library.
-AC_CHECK_HEADER(ical.h,
+AC_CHECK_HEADER(libical/ical.h,
        [AC_CHECK_LIB(ical, icalcomponent_new,
                [
                        LIBS="-lical $LIBS"
@@ -188,7 +188,7 @@ AC_CHECK_HEADER(ical.h,
        ,
        )],
        [
-               AC_MSG_ERROR(ical.h was not found and is required.  More info: http://www.citadel.org/doku.php/installation:start)
+               AC_MSG_ERROR(libical/ical.h was not found and is required.  More info: http://www.citadel.org/doku.php/installation:start)
        ]
 )
 

diff --git a/webcit/webcit.h b/webcit/webcit.h
index 2db42708fe08861d7628970253cad69d325b70bf..9d490779f1a94520b57b700bd50c704a3f87c35f 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -74,24 +74,7 @@ extern locale_t wc_locales[];
 #include <zlib.h>
 #endif
 
-
-/* Work around PACKAGE/VERSION defs that are (not supposed to be?) in ical.h */
-#ifdef PACKAGE
-# define CTDL_PACKAGE PACKAGE
-# undef PACKAGE
-#endif
-
-#ifdef PACKAGE_STRING
-# define CTDL_PACKAGE_STRING PACKAGE_STRING
-//# undef PACKAGE_STRING
-#endif
-
-#ifdef VERSION
-# define CTDL_VERSION VERSION
-# undef VERSION
-#endif
-
-#include <ical.h>
+#include <libical/ical.h>
 
 #undef PACKAGE
 #undef VERSION