summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-28 18:54:36 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-28 18:54:36 +0000
commitfd6a8c5d37835bb9a18e0bca5db86a7e4323dfdb (patch)
treef203514a8731410a161c99c30eef7e5612d484fc
parent0a80cfd57d271dd44221467efb426675fa470356 (diff)
downloadkvirc-fd6a8c5d37835bb9a18e0bca5db86a7e4323dfdb.tar.gz
kvirc-fd6a8c5d37835bb9a18e0bca5db86a7e4323dfdb.zip
Fix FTBFS
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kvirc@1238721 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--admin/acinclude.m4.in8
1 files changed, 5 insertions, 3 deletions
diff --git a/admin/acinclude.m4.in b/admin/acinclude.m4.in
index 89ab7a77..3cb36389 100644
--- a/admin/acinclude.m4.in
+++ b/admin/acinclude.m4.in
@@ -1601,7 +1601,7 @@ AC_DEFUN([AC_SS_FIND_QT3_INCLUDE_DIR],
AC_SS_FIND_FILE_PATH($SS_QT4_INCLUDE_FILE_TO_SEARCH,$ss_qt_include_test_dirs,SS_QT4_INCDIR)
- SS_QT3_INCDIR="$SS_QT4_INCDIR -include tqt.h"
+ SS_QT3_INCDIR="$SS_QT4_INCDIR -I/usr/include/tqt -include tqt.h"
AC_MSG_RESULT([TQt4 detected--Qt4 found in $SS_QT3_INCDIR])
dnl AC_MSG_RESULT([FAILED])
@@ -1623,12 +1623,14 @@ dnl echo "####################################################################
dnl AC_SS_SET_NORMALINK
dnl AC_MSG_ERROR([This was a fatal one...aborting])
else
+ SS_QT3_INCDIR="$SS_QT3_INCDIR -I/usr/include/tqt -include tqt.h"
+
AC_MSG_RESULT([found in $SS_QT3_INCDIR])
fi
else
AC_MSG_RESULT([using user supplied path for the Qt 3.x include files $SS_QT3_INCDIR])
- SS_QT3_INCDIR="$SS_QT3_INCDIR -include tqt.h"
+ SS_QT3_INCDIR="$SS_QT3_INCDIR -I/usr/include/tqt -include tqt.h"
fi
])
@@ -1952,7 +1954,7 @@ AC_DEFUN([AC_SS_ENSURE_CAN_COMPILE_X_AND_QT3],
CPPFLAGS=""
fi
CPPFLAGS="$CPPFLAGS -I$SS_QT3_INCDIR"
- CXXFLAGS="-O2 -Wall -include tqt.h $CXXFLAGS"
+ CXXFLAGS="-O2 -Wall -I/usr/include/tqt -include tqt.h $CXXFLAGS"
if test -n "$SS_X_LIBDIR"; then
LIBS="-L$SS_X_LIBDIR"
else