[Libreoffice-commits] core.git: configure.ac

Luboš Luňák l.lunak at suse.cz
Fri Jun 28 05:57:09 PDT 2013


 configure.ac |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit d61ad2faff41548da8bfc612611ae4574bb5e9c8
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Fri Jun 28 14:56:04 2013 +0200

    s/-I/-isystem/ also for KDE headers
    
    Should have been included in daaaaf7dcd3982c80031bda141822a469fd5cc6f .
    
    Change-Id: Icc6ecf42580d708dc8c610866212ece2e2026452

diff --git a/configure.ac b/configure.ac
index 1d4bbc1..aa440fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10539,6 +10539,7 @@ your KDE3 installation by exporting KDEDIR before running "configure".])
     dnl Set the variables
     KDE_CFLAGS="-I$qt_incdir -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
     KDE_LIBS="-L$kde_libdir -L$qt_libdir -lkdeui -lkdecore -lqt-mt"
+    KDE_CFLAGS=$(printf '%s' "$KDE_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
 fi
 AC_SUBST(KDE_CFLAGS)
 AC_SUBST(KDE_LIBS)
@@ -10691,6 +10692,7 @@ the root of your Qt installation by exporting QT4DIR before running "configure".
 
     KDE4_CFLAGS="`pkg-config --cflags QtCore` `pkg-config --cflags QtGui` -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
     KDE4_LIBS="-L$kde_libdir -L$qt_lib_dir -lkio -lkfile -lkdeui -lkdecore -lQtCore -lQtGui"
+    KDE4_CFLAGS=$(printf '%s' "$KDE4_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
 
     AC_LANG_PUSH([C++])
     save_CXXFLAGS=$CXXFLAGS


More information about the Libreoffice-commits mailing list