diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-03-27 17:59:11 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-12-18 08:20:15 +0100 |
| commit | 2317c3a2be3c7f94a57d6d43ae03707debfd3997 (patch) | |
| tree | 6c1f31878fb464d6e7a470af45f210af74a53891 | |
| parent | 921a3f220b670392521f0c06807cf9f8f281e61c (diff) | |
| download | tdesdk-2317c3a2be3c7f94a57d6d43ae03707debfd3997.tar.gz tdesdk-2317c3a2be3c7f94a57d6d43ae03707debfd3997.zip | |
Fix FTBFS
(cherry picked from commit 629e22830f70d6e0d221361cd346fbf433ddce76)
| -rw-r--r-- | kbugbuster/Makefile.am | 5 | ||||
| -rw-r--r-- | kbugbuster/configure.in.in | 2 | ||||
| -rw-r--r-- | kbugbuster/kresources/Makefile.am | 6 |
3 files changed, 9 insertions, 4 deletions
diff --git a/kbugbuster/Makefile.am b/kbugbuster/Makefile.am index 70fc1a23..27806bf2 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 25719241..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)/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 |