[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/trinity/kde-common/admin
From:       Timothy Pearson <kb9vqf () pearsoncomputing ! net>
Date:       2011-05-30 1:15:04
Message-ID: 20110530011504.B5D8EAC779 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1234189 by tpearson:

Fix admin-based Autotools configure check failures


 M  +4 -0      acinclude.m4.in  


--- branches/trinity/kde-common/admin/acinclude.m4.in #1234188:1234189
@@ -4956,7 +4956,11 @@
     AC_LANG_CPLUSPLUS
     ac_save_CXXFLAGS="$CXXFLAGS"
     CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
+    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,
[prev in list] [next in list] [prev in thread] [next in thread]