From 1ef6bf4bff7c4472c87bad6584248d101f376aa6 Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Sat, 30 Aug 2008 04:57:03 +0000
Subject: [PATCH] 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.

---
 citadel/configure.ac                     |  4 ++--
 citadel/ical_dezonify.c                  |  2 +-
 citadel/modules/calendar/serv_calendar.c |  2 +-
 webcit/configure.ac                      |  4 ++--
 webcit/webcit.h                          | 19 +------------------
 5 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/citadel/configure.ac b/citadel/configure.ac
index 81e5eae6a..ee2b7bf09 100644
--- 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 662840c41..0e95bdc71 100644
--- 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 35e2bbea8..ae8ae7a78 100644
--- 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 bb7663429..7ddfc1323 100644
--- 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 2db42708f..9d490779f 100644
--- 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
-- 
2.30.2