summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-18 22:43:28 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-18 22:43:28 +0000
commitc6cec811e5a76816fb5511bd3f331dbff7175edd (patch)
treebdf4ba8c9883547270645e3996933ab6a17ab711
parent992c8ad36e8e9792ce9a5b179d75e07d0907bd9d (diff)
downloadadmin-c6cec811e5a76816fb5511bd3f331dbff7175edd.tar.gz
admin-c6cec811e5a76816fb5511bd3f331dbff7175edd.zip
Fix admin/ Autotools build issues noticed in kdegraphics
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kde-common/admin@1237430 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--acinclude.m4.in8
1 files changed, 7 insertions, 1 deletions
diff --git a/acinclude.m4.in b/acinclude.m4.in
index 2458f2c..cddad6f 100644
--- a/acinclude.m4.in
+++ b/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