TDE
/
kvirc
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kvirc
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix FTBFS on tqt3

Browse Source
pull/1/head
Timothy Pearson 13 years ago
parent a4237c7ae7
commit 2b0f7501a0
3 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File

15
acinclude.m4
Unescape View File

@ -1522,6 +1522,8 @@ AC_DEFUN([AC_SS_FIND_QT3_GENERAL_DIR],
ss_qt_general_test_path_suffix="$ss_qt_general_test_path_suffix lib" ss_qt_general_test_path_suffix="$ss_qt_general_test_path_suffix lib"
ss_qt_general_test_path_suffix="$ss_qt_general_test_path_suffix qt ." ss_qt_general_test_path_suffix="$ss_qt_general_test_path_suffix qt ."
AC_SS_FIND_FILE_PATH_EXT($SS_TQT3_GENERAL_FILE_TO_SEARCH,$ss_qt_general_test_dirs,$ss_qt_general_test_path_suffix,SS_QT3_GENERAL_DIR)
if test "$SS_QT3_GENERAL_DIR" = "FAILED"; then
AC_SS_FIND_FILE_PATH_EXT($SS_QT3_GENERAL_FILE_TO_SEARCH,$ss_qt_general_test_dirs,$ss_qt_general_test_path_suffix,SS_QT3_GENERAL_DIR) AC_SS_FIND_FILE_PATH_EXT($SS_QT3_GENERAL_FILE_TO_SEARCH,$ss_qt_general_test_dirs,$ss_qt_general_test_path_suffix,SS_QT3_GENERAL_DIR)
if test "$SS_QT3_GENERAL_DIR" = "FAILED"; then if test "$SS_QT3_GENERAL_DIR" = "FAILED"; then
AC_MSG_RESULT([failed...continuing with normal checks]) AC_MSG_RESULT([failed...continuing with normal checks])
@ -1529,6 +1531,9 @@ AC_DEFUN([AC_SS_FIND_QT3_GENERAL_DIR],
else else
AC_MSG_RESULT([Seems to be $SS_QT3_GENERAL_DIR]) AC_MSG_RESULT([Seems to be $SS_QT3_GENERAL_DIR])
fi fi
else
AC_MSG_RESULT([Seems to be $SS_QT3_GENERAL_DIR])
fi
]) ])
AC_DEFUN([AC_SS_FIND_QT4_GENERAL_DIR], AC_DEFUN([AC_SS_FIND_QT4_GENERAL_DIR],
@ -1581,12 +1586,16 @@ AC_DEFUN([AC_SS_FIND_QT3_INCLUDE_DIR],
ss_qt_include_test_dirs="$SS_QT3_GENERAL_DIR/include /include /usr/include /usr/local/include /usr/qt/include /usr/local/qt/include /usr/X11R6/include /usr/lib/qt/include /usr/lib/qt /usr/include/X11" ss_qt_include_test_dirs="$SS_QT3_GENERAL_DIR/include /include /usr/include /usr/local/include /usr/qt/include /usr/local/qt/include /usr/X11R6/include /usr/lib/qt/include /usr/lib/qt /usr/include/X11"
test -n "$QTDIR" && ss_qt_include_test_dirs="$QTDIR/include $QTDIR $ss_qt_include_test_dirs" test -n "$QTDIR" && ss_qt_include_test_dirs="$QTDIR/include $QTDIR $ss_qt_include_test_dirs"
ss_qt_include_test_dirs="$ss_qt_include_test_dirs /usr/include/qt /usr/include/qt3 /usr/local/include/qt /include/qt /usr/X11R6/include/qt /usr/build/qt/include" ss_qt_include_test_dirs="$ss_qt_include_test_dirs /usr/include/qt /usr/include/tqt3 /usr/include/qt3 /usr/local/include/qt /include/qt /usr/X11R6/include/qt /usr/build/qt/include"
ss_qt_include_test_dirs="$ss_qt_include_test_dirs /usr/include/qt$SS_QT3_MAJOR_VERSION_REQUIRED /usr/include/qt-$SS_QT3_MAJOR_VERSION_REQUIRED /usr/local/include/qt$SS_QT3_MAJOR_VERSION_REQUIRED" ss_qt_include_test_dirs="$ss_qt_include_test_dirs /usr/include/tqt$SS_QT3_MAJOR_VERSION_REQUIRED /usr/include/qt$SS_QT3_MAJOR_VERSION_REQUIRED /usr/include/qt-$SS_QT3_MAJOR_VERSION_REQUIRED /usr/local/include/qt$SS_QT3_MAJOR_VERSION_REQUIRED"
ss_qt_include_test_dirs="$ss_qt_include_test_dirs /include/qt$SS_QT3_MAJOR_VERSION_REQUIRED /usr/X11R6/include/qt$SS_QT3_MAJOR_VERSION_REQUIRED" ss_qt_include_test_dirs="$ss_qt_include_test_dirs /include/tqt$SS_QT3_MAJOR_VERSION_REQUIRED /include/qt$SS_QT3_MAJOR_VERSION_REQUIRED /usr/X11R6/include/qt$SS_QT3_MAJOR_VERSION_REQUIRED"
ss_qt_include_test_dirs="$ss_qt_include_test_dirs /usr/include/X11/qt$SS_QT3_MAJOR_VERSION_REQUIRED /opt/qt /opt/kde/qt" ss_qt_include_test_dirs="$ss_qt_include_test_dirs /usr/include/X11/qt$SS_QT3_MAJOR_VERSION_REQUIRED /opt/qt /opt/kde/qt"
AC_SS_FIND_FILE_PATH($SS_TQT3_INCLUDE_FILE_TO_SEARCH,$ss_qt_include_test_dirs,SS_QT3_INCDIR)
if test "$SS_QT3_INCDIR" = "FAILED"; then
AC_SS_FIND_FILE_PATH($SS_QT3_INCLUDE_FILE_TO_SEARCH,$ss_qt_include_test_dirs,SS_QT3_INCDIR) AC_SS_FIND_FILE_PATH($SS_QT3_INCLUDE_FILE_TO_SEARCH,$ss_qt_include_test_dirs,SS_QT3_INCDIR)
fi
if test "$SS_QT3_INCDIR" = "FAILED"; then if test "$SS_QT3_INCDIR" = "FAILED"; then

9
admin/acinclude.m4.in
Unescape View File

@ -1522,6 +1522,8 @@ AC_DEFUN([AC_SS_FIND_QT3_GENERAL_DIR],
ss_qt_general_test_path_suffix="$ss_qt_general_test_path_suffix lib" ss_qt_general_test_path_suffix="$ss_qt_general_test_path_suffix lib"
ss_qt_general_test_path_suffix="$ss_qt_general_test_path_suffix qt ." ss_qt_general_test_path_suffix="$ss_qt_general_test_path_suffix qt ."
AC_SS_FIND_FILE_PATH_EXT($SS_TQT3_GENERAL_FILE_TO_SEARCH,$ss_qt_general_test_dirs,$ss_qt_general_test_path_suffix,SS_QT3_GENERAL_DIR)
if test "$SS_QT3_GENERAL_DIR" = "FAILED"; then
AC_SS_FIND_FILE_PATH_EXT($SS_QT3_GENERAL_FILE_TO_SEARCH,$ss_qt_general_test_dirs,$ss_qt_general_test_path_suffix,SS_QT3_GENERAL_DIR) AC_SS_FIND_FILE_PATH_EXT($SS_QT3_GENERAL_FILE_TO_SEARCH,$ss_qt_general_test_dirs,$ss_qt_general_test_path_suffix,SS_QT3_GENERAL_DIR)
if test "$SS_QT3_GENERAL_DIR" = "FAILED"; then if test "$SS_QT3_GENERAL_DIR" = "FAILED"; then
AC_MSG_RESULT([failed...continuing with normal checks]) AC_MSG_RESULT([failed...continuing with normal checks])
@ -1529,6 +1531,9 @@ AC_DEFUN([AC_SS_FIND_QT3_GENERAL_DIR],
else else
AC_MSG_RESULT([Seems to be $SS_QT3_GENERAL_DIR]) AC_MSG_RESULT([Seems to be $SS_QT3_GENERAL_DIR])
fi fi
else
AC_MSG_RESULT([Seems to be $SS_QT3_GENERAL_DIR])
fi
]) ])
AC_DEFUN([AC_SS_FIND_QT4_GENERAL_DIR], AC_DEFUN([AC_SS_FIND_QT4_GENERAL_DIR],
@ -1586,7 +1591,11 @@ AC_DEFUN([AC_SS_FIND_QT3_INCLUDE_DIR],
ss_qt_include_test_dirs="$ss_qt_include_test_dirs /include/tqt$SS_QT3_MAJOR_VERSION_REQUIRED /include/qt$SS_QT3_MAJOR_VERSION_REQUIRED /usr/X11R6/include/qt$SS_QT3_MAJOR_VERSION_REQUIRED" ss_qt_include_test_dirs="$ss_qt_include_test_dirs /include/tqt$SS_QT3_MAJOR_VERSION_REQUIRED /include/qt$SS_QT3_MAJOR_VERSION_REQUIRED /usr/X11R6/include/qt$SS_QT3_MAJOR_VERSION_REQUIRED"
ss_qt_include_test_dirs="$ss_qt_include_test_dirs /usr/include/X11/qt$SS_QT3_MAJOR_VERSION_REQUIRED /opt/qt /opt/kde/qt" ss_qt_include_test_dirs="$ss_qt_include_test_dirs /usr/include/X11/qt$SS_QT3_MAJOR_VERSION_REQUIRED /opt/qt /opt/kde/qt"
AC_SS_FIND_FILE_PATH($SS_TQT3_INCLUDE_FILE_TO_SEARCH,$ss_qt_include_test_dirs,SS_QT3_INCDIR)
if test "$SS_QT3_INCDIR" = "FAILED"; then
AC_SS_FIND_FILE_PATH($SS_QT3_INCLUDE_FILE_TO_SEARCH,$ss_qt_include_test_dirs,SS_QT3_INCDIR) AC_SS_FIND_FILE_PATH($SS_QT3_INCLUDE_FILE_TO_SEARCH,$ss_qt_include_test_dirs,SS_QT3_INCDIR)
fi
if test "$SS_QT3_INCDIR" = "FAILED"; then if test "$SS_QT3_INCDIR" = "FAILED"; then

3
configure.in
Unescape View File

@ -89,6 +89,9 @@ SS_QT3_PATCH_LEVEL_REQUIRED="0"
SS_QT3_GENERAL_FILE_TO_SEARCH="include/qinputdialog.h" SS_QT3_GENERAL_FILE_TO_SEARCH="include/qinputdialog.h"
SS_QT3_INCLUDE_FILE_TO_SEARCH="qiconview.h" SS_QT3_INCLUDE_FILE_TO_SEARCH="qiconview.h"
SS_TQT3_GENERAL_FILE_TO_SEARCH="include/ntqinputdialog.h"
SS_TQT3_INCLUDE_FILE_TO_SEARCH="ntqiconview.h"
SS_QT4_MAJOR_VERSION_REQUIRED="4" SS_QT4_MAJOR_VERSION_REQUIRED="4"
SS_QT4_MINOR_VERSION_REQUIRED="0" SS_QT4_MINOR_VERSION_REQUIRED="0"
SS_QT4_PATCH_LEVEL_REQUIRED="0" SS_QT4_PATCH_LEVEL_REQUIRED="0"

Write Preview
Loading…
Cancel
Save