summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiels Ole Salscheider <niels_ole@salscheider-online.de>2014-03-02 12:59:32 +0100
committerPatrick Ohly <patrick.ohly@intel.com>2014-03-05 12:18:17 +0100
commit7aa9f6d87fc1bd511b86b06a434766fc6aaf3866 (patch)
tree18857f2e45194d36d142f2eb86cceb82d414cfb8
parentb560e16b6ab354dc97bcfc60389a358c06177e79 (diff)
autotools: Add QtCore include path to KDEPIM_CFLAGS (FDO #75670)
This fixes an issue where configure fails to find Akonadi when test programs do not compile because QString is not found: checking for Akonadi/Collection... no configure: error: akonadi.pc not found. Install it to compile with the Akonadi backend enabled. ... configure:21857: checking Akonadi/Collection presence configure:21857: g++ -E -I/usr/include/ -I/usr/include//KDE -I/usr/include/qt4 conftest.cpp In file included from /usr/include//KDE/Akonadi/../../akonadi/collection.h:25:0, from /usr/include//KDE/Akonadi/Collection:1, from conftest.cpp:44: /usr/include/akonadi/entity.h:24:19: fatal error: QString: No such file or directory #include <QString>
-rw-r--r--src/backends/akonadi/configure-sub.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/backends/akonadi/configure-sub.in b/src/backends/akonadi/configure-sub.in
index 064c2ede..ed05f1b5 100644
--- a/src/backends/akonadi/configure-sub.in
+++ b/src/backends/akonadi/configure-sub.in
@@ -10,7 +10,7 @@ AKONADIFOUND=yes
if ! test "$KDEPIM_CFLAGS"; then
KDEPIM_CFLAGS="-I`kde4-config --path include` -I`kde4-config --path include`/KDE"
if test "$QMAKE"; then
- KDEPIM_CFLAGS="$KDEPIM_CFLAGS -I`$QMAKE -query QT_INSTALL_HEADERS`"
+ KDEPIM_CFLAGS="$KDEPIM_CFLAGS -I`$QMAKE -query QT_INSTALL_HEADERS` -I`$QMAKE -query QT_INSTALL_HEADERS`/QtCore"
fi
fi
if ! test "$KDEPIM_LIBS"; then