summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-26 09:40:11 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-26 09:40:11 -0600
commit5fa8a1f6672abaf9355fdb0cfe7ca665a660671e (patch)
tree95f1a86d37be0b410f810df1b5995607b97e0db9
parentf2d5ceb21e2bb0dc6d73f44f6fdfb3f9ee9f55b3 (diff)
downloadkvirc-5fa8a1f6672abaf9355fdb0cfe7ca665a660671e.tar.gz
kvirc-5fa8a1f6672abaf9355fdb0cfe7ca665a660671e.zip
Fix FTBFS
-rw-r--r--admin/acinclude.m4.in33
1 files changed, 30 insertions, 3 deletions
diff --git a/admin/acinclude.m4.in b/admin/acinclude.m4.in
index caa60d4f..af6c02ca 100644
--- a/admin/acinclude.m4.in
+++ b/admin/acinclude.m4.in
@@ -1581,9 +1581,9 @@ 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)
@@ -1692,6 +1692,33 @@ AC_DEFUN([AC_SS_FIND_QT3_LIBRARY_DIR],
test -n "$QTDIR" && ss_qt_library_test_dirs="$QTDIR/lib $QTDIR $ss_qt_library_test_dirs"
ss_qt_library_test_dirs="$ss_qt_library_test_dirs /usr/local/lib/qt /usr/X11R6/lib/qt /usr/build/qt/lib /opt/lib /opt/qt/lib"
+ # NATIVE TQT3
+ ss_qt_libs_to_find="libt$SS_QTLIB_NAME-mt.so.$SS_QT3_MAJOR_VERSION_REQUIRED.$SS_QT3_MINOR_VERSION_REQUIRED.$SS_QT3_PATCH_LEVEL_REQUIRED"
+ ss_qt_libs_to_find="$ss_qt_libs_to_find libt$SS_QTLIB_NAME-mt.so.$SS_QT3_MAJOR_VERSION_REQUIRED.$SS_QT3_MINOR_VERSION_REQUIRED"
+ ss_qt_libs_to_find="$ss_qt_libs_to_find libt$SS_QTLIB_NAME-mt.so.$SS_QT3_MAJOR_VERSION_REQUIRED"
+ ss_qt_libs_to_find="$ss_qt_libs_to_find libt$SS_QTLIB_NAME-mt.so"
+ ss_qt_libs_to_find="$ss_qt_libs_to_find libt$SS_QTLIB_NAME.so.$SS_QT3_MAJOR_VERSION_REQUIRED.$SS_QT3_MINOR_VERSION_REQUIRED.$SS_QT3_PATCH_LEVEL_REQUIRED"
+ ss_qt_libs_to_find="$ss_qt_libs_to_find libt$SS_QTLIB_NAME.so.$SS_QT3_MAJOR_VERSION_REQUIRED.$SS_QT3_MINOR_VERSION_REQUIRED"
+ ss_qt_libs_to_find="$ss_qt_libs_to_find libt$SS_QTLIB_NAME.so.$SS_QT3_MAJOR_VERSION_REQUIRED"
+ ss_qt_libs_to_find="$ss_qt_libs_to_find libt$SS_QTLIB_NAME.so"
+ ss_qt_libs_to_find="$ss_qt_libs_to_find libt$SS_QTLIB_NAME-mt.$SS_QT3_MAJOR_VERSION_REQUIRED.$SS_QT3_MINOR_VERSION_REQUIRED.$SS_QT3_PATCH_LEVEL_REQUIRED.dylib"
+ ss_qt_libs_to_find="$ss_qt_libs_to_find libt$SS_QTLIB_NAME-mt.$SS_QT3_MAJOR_VERSION_REQUIRED.$SS_QT3_MINOR_VERSION_REQUIRED.dylib"
+ ss_qt_libs_to_find="$ss_qt_libs_to_find libt$SS_QTLIB_NAME-mt.$SS_QT3_MAJOR_VERSION_REQUIRED.dylib"
+ ss_qt_libs_to_find="$ss_qt_libs_to_find libt$SS_QTLIB_NAME-mt.dylib"
+ ss_qt_libs_to_find="$ss_qt_libs_to_find libt$SS_QTLIB_NAME.$SS_QT3_MAJOR_VERSION_REQUIRED.$SS_QT3_MINOR_VERSION_REQUIRED.$SS_QT3_PATCH_LEVEL_REQUIRED.dylib"
+ ss_qt_libs_to_find="$ss_qt_libs_to_find libt$SS_QTLIB_NAME.$SS_QT3_MAJOR_VERSION_REQUIRED.$SS_QT3_MINOR_VERSION_REQUIRED.dylib"
+ ss_qt_libs_to_find="$ss_qt_libs_to_find libt$SS_QTLIB_NAME.$SS_QT3_MAJOR_VERSION_REQUIRED.dylib"
+ ss_qt_libs_to_find="$ss_qt_libs_to_find libt$SS_QTLIB_NAME.dylib"
+ ss_qt_libs_to_find="$ss_qt_libs_to_find libt$SS_QTLIB_NAME-mt.a"
+ ss_qt_libs_to_find="$ss_qt_libs_to_find libt$SS_QTLIB_NAME.a"
+
+ AC_SS_FIND_FILE_PATH($ss_qt_libs_to_find,$ss_qt_library_test_dirs,SS_TQT3_LIBDIR)
+
+ if test "$SS_TQT3_LIBDIR" != "FAILED"; then
+ AC_MSG_RESULT([Native TQt3 detected])
+ SS_QTLIB_NAME="tqt"
+ fi
+
ss_qt_libs_to_find="lib$SS_QTLIB_NAME-mt.so.$SS_QT3_MAJOR_VERSION_REQUIRED.$SS_QT3_MINOR_VERSION_REQUIRED.$SS_QT3_PATCH_LEVEL_REQUIRED"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_QTLIB_NAME-mt.so.$SS_QT3_MAJOR_VERSION_REQUIRED.$SS_QT3_MINOR_VERSION_REQUIRED"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_QTLIB_NAME-mt.so.$SS_QT3_MAJOR_VERSION_REQUIRED"