summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-03-27 17:59:11 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-03-27 17:59:11 -0500
commit629e22830f70d6e0d221361cd346fbf433ddce76 (patch)
treee14ca3c796f58a60926e7b16e55a65a29261e3c6
parentb04ab1170357870254c55eb305a8ab16d46e07c5 (diff)
downloadtdesdk-629e22830f70d6e0d221361cd346fbf433ddce76.tar.gz
tdesdk-629e22830f70d6e0d221361cd346fbf433ddce76.zip
Fix FTBFS
-rw-r--r--kbugbuster/Makefile.am5
-rw-r--r--kbugbuster/configure.in.in2
-rw-r--r--kbugbuster/kresources/Makefile.am6
3 files changed, 9 insertions, 4 deletions
diff --git a/kbugbuster/Makefile.am b/kbugbuster/Makefile.am
index 20b6b0cc..8aa545ed 100644
--- a/kbugbuster/Makefile.am
+++ b/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
diff --git a/kbugbuster/configure.in.in b/kbugbuster/configure.in.in
index 4accaa1e..92b239ee 100644
--- a/kbugbuster/configure.in.in
+++ b/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)
diff --git a/kbugbuster/kresources/Makefile.am b/kbugbuster/kresources/Makefile.am
index ad8562ad..b411e3c8 100644
--- a/kbugbuster/kresources/Makefile.am
+++ b/kbugbuster/kresources/Makefile.am
@@ -1,4 +1,8 @@
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kbugbuster/backend $(all_includes) $(KDE_INCLUDES)
+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