git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kvirc@1238721 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 14 years ago
parent 0a80cfd57d
commit fd6a8c5d37

@ -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) 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]) AC_MSG_RESULT([TQt4 detected--Qt4 found in $SS_QT3_INCDIR])
dnl AC_MSG_RESULT([FAILED]) dnl AC_MSG_RESULT([FAILED])
@ -1623,12 +1623,14 @@ dnl echo "####################################################################
dnl AC_SS_SET_NORMALINK dnl AC_SS_SET_NORMALINK
dnl AC_MSG_ERROR([This was a fatal one...aborting]) dnl AC_MSG_ERROR([This was a fatal one...aborting])
else else
SS_QT3_INCDIR="$SS_QT3_INCDIR -I/usr/include/tqt -include tqt.h"
AC_MSG_RESULT([found in $SS_QT3_INCDIR]) AC_MSG_RESULT([found in $SS_QT3_INCDIR])
fi fi
else else
AC_MSG_RESULT([using user supplied path for the Qt 3.x include files $SS_QT3_INCDIR]) 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 fi
]) ])
@ -1952,7 +1954,7 @@ AC_DEFUN([AC_SS_ENSURE_CAN_COMPILE_X_AND_QT3],
CPPFLAGS="" CPPFLAGS=""
fi fi
CPPFLAGS="$CPPFLAGS -I$SS_QT3_INCDIR" 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 if test -n "$SS_X_LIBDIR"; then
LIBS="-L$SS_X_LIBDIR" LIBS="-L$SS_X_LIBDIR"
else else

Loading…
Cancel
Save