diff options
| author | Rene Engelhard <rene@debian.org> | 2016-05-24 16:35:57 +0200 |
|---|---|---|
| committer | Tomáš Chvátal <tchvatal@suse.com> | 2016-05-24 16:35:57 +0200 |
| commit | 91fcc0032c2d0d343b914dfe3bea0b0bf1589e91 (patch) | |
| tree | 5565d2fd61f28e0353fcf6728c992dac0beb4480 /configure.ac | |
| parent | 26333736f103342344b9b0fa20a3a04d426fac4f (diff) | |
KDE4 cflags no /usr/include usage to fix build failure with gcc6
Change-Id: I53106b9ebfa7cc5c7b6c6d6f3bb3a4e5f2261f4f
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 091abb4c8141..86cc7b687697 100644 --- a/configure.ac +++ b/configure.ac @@ -11117,6 +11117,7 @@ the root of your Qt installation by exporting QT4DIR before running "configure". if test "x$kde_incdir" = "xno"; then AC_MSG_ERROR([KDE4 headers not found. Please specify the root of your KDE4 installation by exporting KDE4DIR before running "configure".]) fi + if test "$kde_incdir" = "/usr/include"; then kde_incdir=; fi dnl Check for KDE4 libraries AC_MSG_CHECKING([for KDE4 libraries]) @@ -11134,7 +11135,12 @@ the root of your Qt installation by exporting QT4DIR before running "configure". fi PKG_CHECK_MODULES([QT4],[QtNetwork QtGui]) - KDE4_CFLAGS="-I$kde_incdir $QT4_CFLAGS -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT" + if ! test -z "$kde_incdir"; then + KDE4_CFLAGS="-I$kde_incdir $QT4_CFLAGS -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT" + else + KDE4_CFLAGS="$QT4_CFLAGS -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT" + fi + KDE4_LIBS="-L$kde_libdir -lkio -lkfile -lkdeui -lkdecore -L$qt_lib_dir $QT4_LIBS" KDE4_CFLAGS=$(printf '%s' "$KDE4_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") FilterLibs "$KDE4_LIBS" |