Merge build fix from the branch:

Add `$(EXTRA_GNOME_CFLAGS)' to the include path list for building the
  dialogs (we use GAL there).

svn path=/trunk/; revision=9598

calendar/ChangeLog

@@ -1,3 +1,7 @@
+2001-04-26  Ettore Perazzoli  <ettore@ximian.com>
+
+	* gui/dialogs/Makefile.am (INCLUDES): Add `$(EXTRA_GNOME_CFLAGS)'.
+
 2001-04-26  Dan Winship  <danw@ximian.com>
 
 	* conduits/todo/Makefile.am (libetodo_conduit_la_LIBADD): Remove

calendar/gui/dialogs/Makefile.am

@@ -9,6 +9,7 @@ INCLUDES = 						\
 	-I$(top_srcdir)/libical/src/libical		\
 	-I$(top_builddir)/libical/src/libical		\
 	-I$(includedir)					\
+	$(EXTRA_GNOME_CFLAGS)				\
 	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
 	$(BONOBO_VFS_GNOME_CFLAGS)			\