--- libreoffice-5.1.2.2/configure.ac.old 2016-03-29 11:50:44.000000000 -0400 +++ libreoffice-5.1.2.2/configure.ac 2016-06-02 20:26:21.919192841 -0400 @@ -11169,6 +11169,7 @@ 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]) @@ -11186,7 +11187,12 @@ 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"