summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-02-24 02:04:52 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-02-24 02:04:52 -0600
commit2b0f7501a0f64a3eac41fffc6256714aba7693c2 (patch)
treef1045beb8f685e8ad8300903bde394cefe014357
parenta4237c7ae7b3762e01161dd33c3e56eb662e6074 (diff)
downloadkvirc-2b0f7501a0f64a3eac41fffc6256714aba7693c2.tar.gz
kvirc-2b0f7501a0f64a3eac41fffc6256714aba7693c2.zip
Fix FTBFS on tqt3
-rw-r--r--acinclude.m423
-rw-r--r--admin/acinclude.m4.in17
-rwxr-xr-xconfigure.in3
3 files changed, 32 insertions, 11 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 345906f1..11973be9 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1522,10 +1522,15 @@ 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 qt ."
- 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_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_MSG_RESULT([failed...continuing with normal checks])
- unset 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
+ AC_MSG_RESULT([failed...continuing with normal checks])
+ unset SS_QT3_GENERAL_DIR
+ else
+ AC_MSG_RESULT([Seems to be $SS_QT3_GENERAL_DIR])
+ fi
else
AC_MSG_RESULT([Seems to be $SS_QT3_GENERAL_DIR])
fi
@@ -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"
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$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 /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/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/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"
- 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_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)
+ fi
if test "$SS_QT3_INCDIR" = "FAILED"; then
diff --git a/admin/acinclude.m4.in b/admin/acinclude.m4.in
index f93e354c..84024485 100644
--- a/admin/acinclude.m4.in
+++ b/admin/acinclude.m4.in
@@ -1522,10 +1522,15 @@ 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 qt ."
- 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_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_MSG_RESULT([failed...continuing with normal checks])
- unset 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
+ AC_MSG_RESULT([failed...continuing with normal checks])
+ unset SS_QT3_GENERAL_DIR
+ else
+ AC_MSG_RESULT([Seems to be $SS_QT3_GENERAL_DIR])
+ fi
else
AC_MSG_RESULT([Seems to be $SS_QT3_GENERAL_DIR])
fi
@@ -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 /usr/include/X11/qt$SS_QT3_MAJOR_VERSION_REQUIRED /opt/qt /opt/kde/qt"
- 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_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)
+ fi
if test "$SS_QT3_INCDIR" = "FAILED"; then
diff --git a/configure.in b/configure.in
index 654898e6..f5196f27 100755
--- a/configure.in
+++ b/configure.in
@@ -89,6 +89,9 @@ SS_QT3_PATCH_LEVEL_REQUIRED="0"
SS_QT3_GENERAL_FILE_TO_SEARCH="include/qinputdialog.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_MINOR_VERSION_REQUIRED="0"
SS_QT4_PATCH_LEVEL_REQUIRED="0"