From 0ce46c75661a6d10492e9d86c600b175e45b2899 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sat, 18 Jun 2011 22:43:28 +0000
Subject: [PATCH] Fix admin/ Autotools build issues noticed in kdegraphics

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

diff --git a/admin/acinclude.m4.in b/admin/acinclude.m4.in
index 2458f2c..cddad6f 100644
--- a/admin/acinclude.m4.in
+++ b/admin/acinclude.m4.in
@@ -1090,7 +1090,7 @@ LIB_XEXT="-lXext"
 QTE_NORTTI=""
 
 CFLAGS="$CFLAGS -I/usr/include/tqt"
-CXXFLAGS="$CXXFLAGS -I/usr/include/tqt -include tqt.h"
+CXXFLAGS="$CXXFLAGS -I/usr/include/tqt"
 
 elif test "$kde_use_qt_emb" = "yes"; then
   dnl We're using QT Embedded
@@ -2977,7 +2977,9 @@ else
 LIBS="$all_libraries $USER_LDFLAGS -l$1 $LIBJPEG $LIBZ -lm"
 fi
 kde_save_CXXFLAGS="$CXXFLAGS"
+kde_save_LDFLAGS="$LDFLAGS"
 CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
+LDFLAGS="$LDFLAGS -ltqt"
 
 AC_TRY_LINK(dnl
 [
@@ -2992,6 +2994,7 @@ AC_TRY_LINK(dnl
 
 LIBS="$kde_save_LIBS"
 CXXFLAGS="$kde_save_CXXFLAGS"
+LDFLAGS="$kde_save_LDFLAGS"
 AC_LANG_RESTORE
 ])
 
@@ -3053,6 +3056,8 @@ AC_CACHE_VAL(ac_cv_libexr,
            AC_LANG_SAVE
            AC_LANG_CPLUSPLUS
            kde_save_CXXFLAGS="$CXXFLAGS"
+           kde_save_LDFLAGS="$LDFLAGS"
+           LDFLAGS="$LFLAGS -ltqt"
            EXR_FLAGS=`$PKG_CONFIG --cflags OpenEXR`
            CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES $EXR_FLAGS"
 
@@ -3070,6 +3075,7 @@ AC_CACHE_VAL(ac_cv_libexr,
            )
            LIBS="$kde_save_LIBS"
            CXXFLAGS="$kde_save_CXXFLAGS"
+           LDFLAGS="$kde_save_LDFLAGS"
            AC_LANG_RESTORE
            ])dnl
            if eval "test ! \"`echo $ac_cv_libexr`\" = no"; then