summaryrefslogtreecommitdiffstats
path: root/admin
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 /admin
parenta4237c7ae7b3762e01161dd33c3e56eb662e6074 (diff)
downloadkvirc-2b0f7501a0f64a3eac41fffc6256714aba7693c2.tar.gz
kvirc-2b0f7501a0f64a3eac41fffc6256714aba7693c2.zip
Fix FTBFS on tqt3
Diffstat (limited to 'admin')
-rw-r--r--admin/acinclude.m4.in17
1 files changed, 13 insertions, 4 deletions
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