@ -1105,7 +1105,7 @@ AC_DEFUN([AC_SS_CHECK_ARTS],
ss_save_LIBS="$LIBS"
ss_save_LIBS="$LIBS"
CPPFLAGS="-I$SS_X_INCDIR -I$SS_QT3_INCDIR -I$SS_KDE_INCDIR $CPPFLAGS $X_CFLAGS"
CPPFLAGS="-I$SS_X_INCDIR -I$SS_QT3_INCDIR -I$SS_KDE_INCDIR $CPPFLAGS $X_CFLAGS"
CXXFLAGS="-O2 -Wall $CXXFLAGS"
CXXFLAGS="-O2 -Wall $CXXFLAGS"
LIBS="-L$SS_KDE_LIBDIR -L$SS_X_LIBDIR $SS_X_LDFLAGS $SS_X_LIBLINK -L$SS_QT3_LIBDIR $LIBS -lsoundserver_idl -ltdecore -l$SS_QTLIB_NAME -Wl,-rpath $SS_KDE_LIBDIR"
LIBS="-L$SS_KDE_LIBDIR -L$SS_X_LIBDIR $SS_X_LDFLAGS $SS_X_LIBLINK -L$SS_QT3_LIBDIR $LIBS -lsoundserver_idl -ltdecore -l$SS_T QTLIB_NAME -Wl,-rpath $SS_KDE_LIBDIR"
if test "$SS_LINK_TO_LIBDL" = "yes"; then
if test "$SS_LINK_TO_LIBDL" = "yes"; then
LIBS="$LIBS -ldl";
LIBS="$LIBS -ldl";
fi
fi
@ -1487,8 +1487,8 @@ AC_DEFUN([AC_SS_FIND_QT],
AC_DEFUN([AC_SS_FIND_QT3_NAME],
AC_DEFUN([AC_SS_FIND_QT3_NAME],
[
[
AC_MSG_CHECKING([for the Qt library name])
AC_MSG_CHECKING([for the Qt library name])
AC_ARG_WITH(qt-name,[ --with-qt-name=NAME Use NAME instead of \"qt\" as Qt library name],SS_QTLIB_NAME="$withval",SS_QTLIB_NAME="qt")
AC_ARG_WITH(qt-name,[ --with-qt-name=NAME Use NAME instead of \"qt\" as Qt library name],SS_T QTLIB_NAME="$withval",SS_T QTLIB_NAME="qt")
AC_MSG_RESULT("$SS_QTLIB_NAME")
AC_MSG_RESULT("$SS_T QTLIB_NAME")
])
])
AC_DEFUN([AC_SS_FIND_QT3_GENERAL_DIR],
AC_DEFUN([AC_SS_FIND_QT3_GENERAL_DIR],
@ -1701,24 +1701,24 @@ AC_DEFUN([AC_SS_FIND_QT3_LIBRARY_DIR],
test -n "$QTDIR" && ss_qt_library_test_dirs="$QTDIR/lib $QTDIR $ss_qt_library_test_dirs"
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"
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"
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="lib$SS_T 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_T 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"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_T QTLIB_NAME-mt.so.$SS_QT3_MAJOR_VERSION_REQUIRED"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_QTLIB_NAME-mt.so"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_T QTLIB_NAME-mt.so"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$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 lib$SS_T 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 lib$SS_QTLIB_NAME.so.$SS_QT3_MAJOR_VERSION_REQUIRED.$SS_QT3_MINOR_VERSION_REQUIRED"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_T QTLIB_NAME.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.so.$SS_QT3_MAJOR_VERSION_REQUIRED"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_T QTLIB_NAME.so.$SS_QT3_MAJOR_VERSION_REQUIRED"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_QTLIB_NAME.so"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_T QTLIB_NAME.so"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$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 lib$SS_T 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 lib$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 lib$SS_T QTLIB_NAME-mt.$SS_QT3_MAJOR_VERSION_REQUIRED.$SS_QT3_MINOR_VERSION_REQUIRED.dylib"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_QTLIB_NAME-mt.$SS_QT3_MAJOR_VERSION_REQUIRED.dylib"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_T QTLIB_NAME-mt.$SS_QT3_MAJOR_VERSION_REQUIRED.dylib"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_QTLIB_NAME-mt.dylib"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_T QTLIB_NAME-mt.dylib"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$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 lib$SS_T 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 lib$SS_QTLIB_NAME.$SS_QT3_MAJOR_VERSION_REQUIRED.$SS_QT3_MINOR_VERSION_REQUIRED.dylib"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_T QTLIB_NAME.$SS_QT3_MAJOR_VERSION_REQUIRED.$SS_QT3_MINOR_VERSION_REQUIRED.dylib"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_QTLIB_NAME.$SS_QT3_MAJOR_VERSION_REQUIRED.dylib"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_T QTLIB_NAME.$SS_QT3_MAJOR_VERSION_REQUIRED.dylib"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_QTLIB_NAME.dylib"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_T QTLIB_NAME.dylib"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_QTLIB_NAME-mt.a"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_T QTLIB_NAME-mt.a"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_QTLIB_NAME.a"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_T QTLIB_NAME.a"
AC_SS_FIND_FILE_PATH($ss_qt_libs_to_find,$ss_qt_library_test_dirs,SS_QT3_LIBDIR)
AC_SS_FIND_FILE_PATH($ss_qt_libs_to_find,$ss_qt_library_test_dirs,SS_QT3_LIBDIR)
@ -1746,7 +1746,7 @@ AC_DEFUN([AC_SS_FIND_QT3_LIBRARY_DIR],
AC_SS_FIND_FILE_PATH($ss_qt_libs_to_find,$ss_qt_library_test_dirs,SS_QT4_LIBDIR)
AC_SS_FIND_FILE_PATH($ss_qt_libs_to_find,$ss_qt_library_test_dirs,SS_QT4_LIBDIR)
SS_QT3_LIBDIR="$SS_QT4_LIBDIR"
SS_QT3_LIBDIR="$SS_QT4_LIBDIR"
SS_QTLIB_NAME="tqt"
SS_T QTLIB_NAME="tqt"
AC_MSG_RESULT([TQt4 detected--Qt4 found in $SS_QT3_LIBDIR])
AC_MSG_RESULT([TQt4 detected--Qt4 found in $SS_QT3_LIBDIR])
dnl AC_MSG_RESULT([FAILED])
dnl AC_MSG_RESULT([FAILED])
@ -1926,22 +1926,22 @@ AC_DEFUN([AC_SS_FIND_QT3_MT],
AC_MSG_CHECKING([for the multithreaded version of Qt])
AC_MSG_CHECKING([for the multithreaded version of Qt])
if test "$SS_QT3_NOMT" = "NOTGIVEN"; then
if test "$SS_QT3_NOMT" = "NOTGIVEN"; then
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="lib$SS_T 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_T 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"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_T QTLIB_NAME-mt.so.$SS_QT3_MAJOR_VERSION_REQUIRED"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_QTLIB_NAME-mt.so"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_T QTLIB_NAME-mt.so"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$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 lib$SS_T 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 lib$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 lib$SS_T QTLIB_NAME-mt.$SS_QT3_MAJOR_VERSION_REQUIRED.$SS_QT3_MINOR_VERSION_REQUIRED.dylib"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_QTLIB_NAME-mt.$SS_QT3_MAJOR_VERSION_REQUIRED.dylib"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_T QTLIB_NAME-mt.$SS_QT3_MAJOR_VERSION_REQUIRED.dylib"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_QTLIB_NAME-mt.dylib"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_T QTLIB_NAME-mt.dylib"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_QTLIB_NAME-mt.a"
ss_qt_libs_to_find="$ss_qt_libs_to_find lib$SS_T QTLIB_NAME-mt.a"
AC_SS_FIND_FILE_PATH($ss_qt_libs_to_find,$SS_QT3_LIBDIR,SS_QTMTLIBDIR)
AC_SS_FIND_FILE_PATH($ss_qt_libs_to_find,$SS_QT3_LIBDIR,SS_QTMTLIBDIR)
if test "$SS_QTMTLIBDIR" = "FAILED"; then
if test "$SS_QTMTLIBDIR" = "FAILED"; then
AC_MSG_RESULT([not found])
AC_MSG_RESULT([not found])
else
else
AC_MSG_RESULT([seems to be available])
AC_MSG_RESULT([seems to be available])
SS_QTLIB_NAME="$SS_QTLIB_NAME-mt"
SS_T QTLIB_NAME="$SS_T QTLIB_NAME-mt"
fi
fi
else
else
AC_MSG_RESULT([disabled by user])
AC_MSG_RESULT([disabled by user])
@ -1969,7 +1969,7 @@ AC_DEFUN([AC_SS_ENSURE_CAN_COMPILE_X_AND_QT3],
else
else
LIBS=""
LIBS=""
fi
fi
LIBS="$LIBS -L$SS_QT3_LIBDIR -l$SS_QTLIB_NAME"
LIBS="$LIBS -L$SS_QT3_LIBDIR -l$SS_T QTLIB_NAME"
if test -n "$SS_X_LDFLAGS"; then
if test -n "$SS_X_LDFLAGS"; then
LIBS="$LIBS $SS_X_LDFLAGS"
LIBS="$LIBS $SS_X_LDFLAGS"
fi
fi
@ -2303,7 +2303,7 @@ AC_DEFUN([AC_SS_ENSURE_CAN_COMPILE_X_QT3_AND_KDE],
if test -n "$SS_X_LIBLINK"; then
if test -n "$SS_X_LIBLINK"; then
LIBS="$LIBS $SS_X_LIBLINK"
LIBS="$LIBS $SS_X_LIBLINK"
fi
fi
LIBS="-L$SS_KDE_LIBDIR -L$SS_QT3_LIBDIR -ltdecore -l$SS_QTLIB_NAME $LIBS -Wl,-rpath $SS_KDE_LIBDIR"
LIBS="-L$SS_KDE_LIBDIR -L$SS_QT3_LIBDIR -ltdecore -l$SS_T QTLIB_NAME $LIBS -Wl,-rpath $SS_KDE_LIBDIR"
if test "$SS_LINK_TO_LIBDL" = "yes"; then
if test "$SS_LINK_TO_LIBDL" = "yes"; then
LIBS="$LIBS -ldl";
LIBS="$LIBS -ldl";
fi
fi
@ -2483,7 +2483,7 @@ AC_DEFUN([AC_SS_FINAL_CONFIG],
fi
fi
if test "$SS_USE_QT4" = "no"; then
if test "$SS_USE_QT4" = "no"; then
SS_LIBLINK="-l$SS_QTLIB_NAME"
SS_LIBLINK="-l$SS_T QTLIB_NAME"
else
else
#if test -n "SS_LOCAL_ADD_DEBUG_SYMBOLS"; then
#if test -n "SS_LOCAL_ADD_DEBUG_SYMBOLS"; then
# SS_LIBLINK="-lQtCore_debug -lQtGui_debug -lQt3Support_debug"
# SS_LIBLINK="-lQtCore_debug -lQtGui_debug -lQt3Support_debug"