From 538030e8fd3b58297a5d26d394033d079716a7de Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Mon, 30 May 2011 01:15:04 +0000
Subject: Fix admin-based Autotools configure check failures

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kde-common@1234189 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 admin/acinclude.m4.in | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/admin/acinclude.m4.in b/admin/acinclude.m4.in
index aee3f3d..b35aaea 100644
--- a/admin/acinclude.m4.in
+++ b/admin/acinclude.m4.in
@@ -4956,7 +4956,11 @@ AC_DEFUN([KDE_CHECK_STL],
     AC_LANG_CPLUSPLUS
     ac_save_CXXFLAGS="$CXXFLAGS"
     CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
-    CXXFLAGS="$CXXFLAGS -I$qt_includes"
+    if test -z "$PKG_CONFIG"; then
+      CXXFLAGS="$CXXFLAGS"
+    else
+      CXXFLAGS="$CXXFLAGS -I$qt_includes"
+    fi
 
     AC_MSG_CHECKING([if C++ programs can be compiled])
     AC_CACHE_VAL(kde_cv_stl_works,
-- 
cgit v1.2.1