Fix FTBFS

(cherry picked from commit 629e22830f)

kbugbuster/Makefile.am

@@ -1,9 +1,10 @@
-INCLUDES= -I$(top_srcdir)/kbugbuster/backend $(all_includes)
-
 if include_kcalresource
 KRESOURCES_SUBDIR = kresources
+LIBKCAL_INCLUDES= $(KDE_INCLUDES)/libkcal
 endif
 
+INCLUDES= -I$(top_srcdir)/kbugbuster/backend $(all_includes) $(LIBKCAL_INCLUDES)
+
 SUBDIRS = backend gui pics $(KRESOURCES_SUBDIR)
 
 bin_PROGRAMS = kbugbuster

kbugbuster/configure.in.in

@@ -1,5 +1,5 @@
 AC_DEFUN([KBUGBUSTER_CHECK_KCAL],[HAVE_KCAL=0
-KDE_CHECK_HEADER(resourcecalendar.h,HAVE_KCAL=1,
+KDE_CHECK_HEADER(libkcal/resourcecalendar.h,HAVE_KCAL=1,
  AC_MSG_WARN([Unable to find libkcal. The Bugzilla todo list \
  resource for KOrganizer won't be compiled.]))
 AM_CONDITIONAL(include_kcalresource, test "$HAVE_KCAL" = 1)

kbugbuster/kresources/Makefile.am

@@ -1,4 +1,8 @@
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kbugbuster/backend $(all_includes) $(KDE_INCLUDES)/kde
+if include_kcalresource
+LIBKCAL_INCLUDES= $(KDE_INCLUDES)/libkcal
+endif
+
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kbugbuster/backend $(all_includes) $(KDE_INCLUDES) $(LIBKCAL_INCLUDES)
 
 kde_module_LTLIBRARIES = kcal_bugzilla.la