INCLUDE path fixes for changes made to libical build.

2003-10-09  Jeffrey Stedfast  <fejj@ximian.com>

	* cal-client/Makefile.am: INCLUDE path fixes for changes made to
	libical build.

	* cal-util/Makefile.am: INCLUDE path fixes for changes made to
	libical build.

	* cal-util/*.[c,h]: #include <libical/ical.h> instead of <ical.h>

	* gui/Makefile.am: INCLUDE path fixes for changes made to libical
	build.

	* gui/*.[c,h]: #include <libical/ical.h> instead of <ical.h>

	* gui/alarm-notify/Makefile.am: INCLUDE path fixes for changes
	made to libical build.

	* gui/alarm-notify/config-data.h: #include <libical/ical.h>
	instead of <ical.h>

	* gui/dialogs/Makefile.am: INCLUDE path fixes for changes made to
	libical build.

	* gui/dialogs/comp-editor-util.c: #include <libical/ical.h>
	instead of <ical.h>

	* gui/dialogs/e-delegate-dialog.c: #include <libical/ical.h>
	instead of <ical.h>

	* importers/Makefile.am: INCLUDE path fixes for changes made to
	libical build.

	* pcs/Makefile.am: INCLUDE path fixes for changes made to libical
	build.

	* pcs/cal.c: #include <libical/ical.h> instead of <ical.h>

svn path=/trunk/; revision=22845

21 files changed, 63 insertions, 29 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 1551bd5ad7..90d0de176d 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,9 +1,48 @@
+2003-10-09  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* cal-client/Makefile.am: INCLUDE path fixes for changes made to
+	libical build.
+
+	* cal-util/Makefile.am: INCLUDE path fixes for changes made to
+	libical build.
+
+	* cal-util/*.[c,h]: #include <libical/ical.h> instead of <ical.h>
+
+	* gui/Makefile.am: INCLUDE path fixes for changes made to libical
+	build.
+
+	* gui/*.[c,h]: #include <libical/ical.h> instead of <ical.h>
+
+	* gui/alarm-notify/Makefile.am: INCLUDE path fixes for changes
+	made to libical build.
+
+	* gui/alarm-notify/config-data.h: #include <libical/ical.h>
+	instead of <ical.h>
+
+	* gui/dialogs/Makefile.am: INCLUDE path fixes for changes made to
+	libical build.
+
+	* gui/dialogs/comp-editor-util.c: #include <libical/ical.h>
+	instead of <ical.h>
+
+	* gui/dialogs/e-delegate-dialog.c: #include <libical/ical.h>
+	instead of <ical.h>
+
+	* importers/Makefile.am: INCLUDE path fixes for changes made to
+	libical build.
+
+	* pcs/Makefile.am: INCLUDE path fixes for changes made to libical
+	build.
+
+	* pcs/cal.c: #include <libical/ical.h> instead of <ical.h>
+
 2003-10-08  Harry Lu  <harry.lu@sun.com>
 
 	* gui/dialogs/alarm-options.glade: Make repeat-quantity and
 	repeat-value of alarm option dialog numeric only.
-	* gui/dialogs/task-details-page.glade: Make percent-complete
-	of task details dialog numeric only.
+
+	* gui/dialogs/task-details-page.glade: Make percent-complete of
+	task details dialog numeric only.
 
 2003-09-30  Mike Kestner <mkestner@ximian.com>
 
diff --git a/calendar/cal-client/Makefile.am b/calendar/cal-client/Makefile.am
index ce2f6d4bbb..5e48e7db23 100644
--- a/calendar/cal-client/Makefile.am
+++ b/calendar/cal-client/Makefile.am
@@ -28,8 +28,7 @@ INCLUDES =						\
 	-I. 						\
 	-I.. 						\
 	-I$(top_builddir)				\
-	-I$(top_builddir)/libical/src/libical		\
-	-I$(top_srcdir)/libical/src/libical		\
+	-I$(top_srcdir)/libical/src			\
 	$(EVOLUTION_CALENDAR_CFLAGS)
 
 privlib_LTLIBRARIES = libcal-client.la
diff --git a/calendar/cal-util/Makefile.am b/calendar/cal-util/Makefile.am
index b7d6715ce0..80eb0dc4f3 100644
--- a/calendar/cal-util/Makefile.am
+++ b/calendar/cal-util/Makefile.am
@@ -7,8 +7,7 @@ INCLUDES =						\
 	-I. 						\
 	-I.. 						\
 	-I$(top_builddir)				\
-	-I$(top_srcdir)/libical/src/libical		\
-	-I$(top_builddir)/libical/src/libical		\
+	-I$(top_srcdir)/libical/src			\
 	$(EVOLUTION_CALENDAR_CFLAGS)
 
 #
diff --git a/calendar/cal-util/cal-component.h b/calendar/cal-util/cal-component.h
index f363099836..3296c7b31c 100644
--- a/calendar/cal-util/cal-component.h
+++ b/calendar/cal-util/cal-component.h
@@ -25,7 +25,7 @@
 #include <glib/gmacros.h>
 #include <time.h>
 #include <glib-object.h>
-#include <ical.h>
+#include <libical/ical.h>
 
 G_BEGIN_DECLS
 
diff --git a/calendar/cal-util/cal-util.h b/calendar/cal-util/cal-util.h
index 03d5cd736b..336fabd6b4 100644
--- a/calendar/cal-util/cal-util.h
+++ b/calendar/cal-util/cal-util.h
@@ -22,7 +22,7 @@
 #ifndef CAL_UTIL_H
 #define CAL_UTIL_H
 
-#include <ical.h>
+#include <libical/ical.h>
 #include <time.h>
 #include <glib.h>
 #include <cal-util/cal-component.h>
diff --git a/calendar/cal-util/timeutil.c b/calendar/cal-util/timeutil.c
index 75e04611a3..32ba50c4ae 100644
--- a/calendar/cal-util/timeutil.c
+++ b/calendar/cal-util/timeutil.c
@@ -10,7 +10,6 @@
 #include <string.h>
 #include <ctype.h>
 #include <glib.h>
-#include <ical.h>
 #include "timeutil.h"
 
 
diff --git a/calendar/cal-util/timeutil.h b/calendar/cal-util/timeutil.h
index 77a8f180e1..df5d2db91c 100644
--- a/calendar/cal-util/timeutil.h
+++ b/calendar/cal-util/timeutil.h
@@ -13,7 +13,7 @@
 
 
 #include <time.h>
-#include <ical.h>
+#include <libical/ical.h>
 #include <glib.h>
 
 
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 553186d85c..f5e80f3de7 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -52,8 +52,7 @@ INCLUDES =						\
 	-I$(top_srcdir)/calendar			\
 	-I$(top_srcdir)/calendar/cal-client		\
 	-I$(top_builddir)/calendar/cal-client		\
-	-I$(top_srcdir)/libical/src/libical		\
-	-I$(top_builddir)/libical/src/libical		\
+	-I$(top_srcdir)/libical/src			\
 	-I$(top_srcdir)/addressbook/backend		\
 	-I$(top_builddir)/addressbook/backend		\
 	-I$(top_srcdir)/widgets				\
diff --git a/calendar/gui/alarm-notify/Makefile.am b/calendar/gui/alarm-notify/Makefile.am
index 8d8ba5df4b..a5340067a4 100644
--- a/calendar/gui/alarm-notify/Makefile.am
+++ b/calendar/gui/alarm-notify/Makefile.am
@@ -22,8 +22,7 @@ INCLUDES = 						\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/calendar			\
 	-I$(top_builddir)/calendar			\
-	-I$(top_srcdir)/libical/src/libical		\
-	-I$(top_builddir)/libical/src/libical		\
+	-I$(top_srcdir)/libical/src			\
 	-I$(top_srcdir)/widgets				\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
 	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"	\
diff --git a/calendar/gui/alarm-notify/config-data.h b/calendar/gui/alarm-notify/config-data.h
index c7041be111..28f5e2d4b1 100644
--- a/calendar/gui/alarm-notify/config-data.h
+++ b/calendar/gui/alarm-notify/config-data.h
@@ -22,7 +22,7 @@
 #define CONFIG_DATA_H
 
 #include <glib.h>
-#include <ical.h>
+#include <libical/ical.h>
 #include <e-util/e-config-listener.h>
 
 EConfigListener *config_data_get_listener (void);
diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am
index e6067d4d23..2466ffaa14 100644
--- a/calendar/gui/dialogs/Makefile.am
+++ b/calendar/gui/dialogs/Makefile.am
@@ -17,8 +17,7 @@ INCLUDES = 								\
 	-I$(top_srcdir)/calendar					\
 	-I$(top_srcdir)/calendar/cal-client				\
 	-I$(top_builddir)/calendar/cal-client				\
-	-I$(top_srcdir)/libical/src/libical				\
-	-I$(top_builddir)/libical/src/libical				\
+	-I$(top_srcdir)/libical/src					\
 	-I$(top_builddir)/shell						\
 	-I$(top_srcdir)/shell						\
 	-I$(top_srcdir)/addressbook/backend				\
diff --git a/calendar/gui/dialogs/comp-editor-util.c b/calendar/gui/dialogs/comp-editor-util.c
index 09b78201c5..ce3cbc42f6 100644
--- a/calendar/gui/dialogs/comp-editor-util.c
+++ b/calendar/gui/dialogs/comp-editor-util.c
@@ -24,7 +24,7 @@
 
 #include <ctype.h>
 #include <string.h>
-#include <ical.h>
+#include <libical/ical.h>
 #include <glib.h>
 #include <gtk/gtklabel.h>
 #include <libgnome/gnome-i18n.h>
diff --git a/calendar/gui/dialogs/e-delegate-dialog.c b/calendar/gui/dialogs/e-delegate-dialog.c
index d9f05691f6..85c17bbd4b 100644
--- a/calendar/gui/dialogs/e-delegate-dialog.c
+++ b/calendar/gui/dialogs/e-delegate-dialog.c
@@ -29,7 +29,7 @@
 #include <gtk/gtkentry.h>
 #include <gtk/gtklabel.h>
 #include <gnome.h>
-#include <ical.h>
+#include <libical/ical.h>
 #include <glade/glade.h>
 #include <gal/util/e-util.h>
 #include <widgets/misc/e-map.h>
diff --git a/calendar/gui/e-cell-date-edit-text.h b/calendar/gui/e-cell-date-edit-text.h
index 2e4a768586..53abb7dcff 100644
--- a/calendar/gui/e-cell-date-edit-text.h
+++ b/calendar/gui/e-cell-date-edit-text.h
@@ -29,7 +29,7 @@
 #ifndef _E_CELL_DATE_EDIT_TEXT_H_
 #define _E_CELL_DATE_EDIT_TEXT_H_
 
-#include <ical.h>
+#include <libical/ical.h>
 #include <gal/e-table/e-cell-text.h>
 
 G_BEGIN_DECLS
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index ed15183552..8b39b82b8c 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -42,7 +42,7 @@
 #include <gal/widgets/e-unicode.h>
 #include <gtkhtml/gtkhtml.h>
 #include <gtkhtml/gtkhtml-stream.h>
-#include <ical.h>
+#include <libical/ical.h>
 #include <cal-util/cal-component.h>
 #include <cal-util/timeutil.h>
 #include <cal-client/cal-client.h>
diff --git a/calendar/gui/itip-bonobo-control.c b/calendar/gui/itip-bonobo-control.c
index 6ce9bf6799..cb52bb579b 100644
--- a/calendar/gui/itip-bonobo-control.c
+++ b/calendar/gui/itip-bonobo-control.c
@@ -32,7 +32,7 @@
 #include <bonobo/bonobo-stream-client.h>
 #include <bonobo/bonobo-context.h>
 #include <bonobo/bonobo-exception.h>
-#include <ical.h>
+#include <libical/ical.h>
 
 #include "e-itip-control.h"
 #include "itip-bonobo-control.h"
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index 366261ecff..f5baa8bb05 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -32,7 +32,7 @@
 #include <gtk/gtkwidget.h>
 #include <gal/widgets/e-unicode.h>
 #include <gal/util/e-util.h>
-#include <ical.h>
+#include <libical/ical.h>
 #include <Evolution-Composer.h>
 #include <e-util/e-dialog-utils.h>
 #include <e-util/e-time-utils.h>
diff --git a/calendar/gui/itip-utils.h b/calendar/gui/itip-utils.h
index c73f11673c..981fd2a12d 100644
--- a/calendar/gui/itip-utils.h
+++ b/calendar/gui/itip-utils.h
@@ -2,7 +2,7 @@
 #ifndef ITIP_UTILS_HEADER
 #define ITIP_UTILS_HEADER
 
-#include <ical.h>
+#include <libical/ical.h>
 #include <string.h>
 #include <glib.h>
 #include <cal-client/cal-client.h>
diff --git a/calendar/importers/Makefile.am b/calendar/importers/Makefile.am
index f660dc16cb..267c4dba80 100644
--- a/calendar/importers/Makefile.am
+++ b/calendar/importers/Makefile.am
@@ -15,8 +15,7 @@ INCLUDES = 						\
 	-I$(top_builddir)/calendar/cal-client		\
 	-I$(top_srcdir)/calendar			\
 	-I$(top_builddir)/calendar			\
-	-I$(top_srcdir)/libical/src/libical		\
-	-I$(top_builddir)/libical/src/libical		\
+	-I$(top_srcdir)/libical/src			\
 	-I$(top_srcdir)/libical/src/libicalvcal		\
 	$(EVOLUTION_CALENDAR_CFLAGS)
 
diff --git a/calendar/pcs/Makefile.am b/calendar/pcs/Makefile.am
index aca5f34bad..19b0b66dac 100644
--- a/calendar/pcs/Makefile.am
+++ b/calendar/pcs/Makefile.am
@@ -3,8 +3,7 @@ INCLUDES =						\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/calendar			\
 	-I$(top_builddir)/calendar			\
-	-I$(top_srcdir)/libical/src/libical		\
-	-I$(top_builddir)/libical/src/libical		\
+	-I$(top_srcdir)/libical/src			\
 	-I$(top_srcdir)/libwombat			\
 	-I$(top_builddir)/libwombat			\
 	$(EVOLUTION_CALENDAR_CFLAGS)
diff --git a/calendar/pcs/cal.c b/calendar/pcs/cal.c
index 03f85eba32..0f20d88186 100644
--- a/calendar/pcs/cal.c
+++ b/calendar/pcs/cal.c
@@ -20,8 +20,11 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
-#include <ical.h>
+#endif
+
+#include <libical/ical.h>
 #include <bonobo/bonobo-exception.h>
 #include "cal.h"
 #include "cal-backend.h"