1 files changed, 25 insertions, 95 deletions
diff --git a/acinclude.m4.in b/acinclude.m4.in
index 3f0c0fc..c75d383 100644
--- a/acinclude.m4.in
+++ b/acinclude.m4.in
@@ -256,9 +256,9 @@ configure.
 
 AC_DEFUN([KDE_TQTMOC_ERROR_MESSAGE],
 [
-    AC_MSG_ERROR([No Trinity TQt meta object compiler (tmoc) found!
+    AC_MSG_ERROR([No Trinity TQt meta object compiler (tqmoc) found!
 Please check whether you installed the Trinity TQt Interface correctly.
-You need to have a running tmoc binary.
+You need to have a running tqmoc binary.
 configure tried to run $ac_cv_path_moc and the test didn't
 succeed. If configure shouldn't have tried this one, set
 the environment variable TQTMOC to the right one before running
@@ -270,7 +270,7 @@ AC_DEFUN([KDE_UIC_ERROR_MESSAGE],
 [
     AC_MSG_WARN([No TQt ui compiler (tquic) found!
 Please check whether you installed TQt correctly.
-You need to have a running uic binary.
+You need to have a running tquic binary.
 configure tried to run $ac_cv_path_uic and the test didn't
 succeed. If configure shouldn't have tried this one, set
 the environment variable UIC to the right one before running
@@ -281,7 +281,7 @@ configure.
 
 AC_DEFUN([KDE_CHECK_UIC_FLAG],
 [
-    AC_MSG_CHECKING([whether uic supports -$1 ])
+    AC_MSG_CHECKING([whether tquic supports -$1 ])
     kde_cache=`echo $1 | sed 'y% .=/+-%____p_%'`
     AC_CACHE_VAL(kde_cv_prog_uic_$kde_cache,
     [
@@ -319,7 +319,7 @@ AC_DEFUN([AC_PATH_TQT_MOC_UIC],
    AC_REQUIRE([KDE_CHECK_PERL])
    tqt_bindirs=""
    for dir in $kde_tqt_dirs; do
-      tqt_bindirs="$tqt_bindirs $dir/bin $dir/src/moc"
+      tqt_bindirs="$tqt_bindirs $dir/bin $dir/src/tqmoc"
    done
    tqt_bindirs="$tqt_bindirs /usr/bin /usr/X11R6/bin /usr/local/tqt/bin"
    if test ! "$ac_tqt_bindir" = "NO"; then
@@ -354,7 +354,7 @@ AC_DEFUN([AC_PATH_TQT_MOC_UIC],
        fi
      fi
    else
-     UIC="echo uic not available: "
+     UIC="echo tquic not available: "
    fi
 
    AC_SUBST(MOC)
@@ -714,9 +714,6 @@ support])
    # more headers that need to be explicitly included on darwin
    AC_CHECK_HEADERS(sys/types.h stdint.h)
 
-   # sys/bitypes.h is needed for uint32_t and friends on Tru64
-   AC_CHECK_HEADERS(sys/bitypes.h)
-
    # darwin requires a poll emulation library
    AC_CHECK_LIB(poll, poll, LIB_POLL="-lpoll")
 
@@ -779,29 +776,6 @@ AH_VERBATIM(_AIX_STRINGS_H_BZERO,
 
 AC_CHECK_FUNCS([vsnprintf snprintf])
 
-AH_VERBATIM(_TRU64,[
-/*
- * On HP-UX, the declaration of vsnprintf() is needed every time !
- */
-
-#if !defined(HAVE_VSNPRINTF) || defined(hpux)
-#if __STDC__
-#include <stdarg.h>
-#include <stdlib.h>
-#else
-#include <varargs.h>
-#endif
-#ifdef __cplusplus
-extern "C"
-#endif
-int vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
-#ifdef __cplusplus
-extern "C"
-#endif
-int snprintf(char *str, size_t n, char const *fmt, ...);
-#endif
-])
-
 ])
 
 dnl ------------------------------------------------------------------------
@@ -987,8 +961,8 @@ fi
 LIB_XEXT="-lXext"
 TQTE_NORTTI=""
 
-CFLAGS="$CFLAGS -I/usr/include/tqt"
-CXXFLAGS="$CXXFLAGS -I/usr/include/tqt"
+CFLAGS="$CFLAGS -I/usr/include/tqt3 -I/usr/include/tqt"
+CXXFLAGS="$CXXFLAGS -I/usr/include/tqt3 -I/usr/include/tqt"
 
 elif test "$kde_use_tqt_emb" = "yes"; then
   dnl We're using TQT Embedded
@@ -1044,16 +1018,8 @@ if $PKG_CONFIG --exists tqt-mt ; then
 cat >> conftest.$ac_ext <<EOF
 #include <tqglobal.h>
 #include <tqapplication.h>
-EOF
-fi
-fi
-
-if test "$kde_tqtver" = "3"; then
-if $PKG_CONFIG --exists tqt-mt ; then
-cat >> conftest.$ac_ext <<EOF
 #include <tqcursor.h>
 #include <tqstylefactory.h>
-#include <tqucomextra_p.h>
 EOF
 fi
 fi
@@ -1084,13 +1050,13 @@ AC_DEFUN([KDE_USE_TQT],
   kde_tqtver=0
   kde_tqtsubver=0
 
-  KDE_PKG_CHECK_MODULES(TQt, tqt)
+  KDE_PKG_CHECK_MODULES(TQt, tqt-mt)
   AC_LANG_SAVE
   AC_LANG_CPLUSPLUS
   ac_cxxflags_safe="$CXXFLAGS"
   CXXFLAGS="$CXXFLAGS $TQt_CFLAGS"
   AC_TRY_COMPILE([
-  #include <tqt.h>
+  #include <tqglobal.h>
   ], ,
     kde_tqtver=3,
   )
@@ -1381,17 +1347,13 @@ if test "$PKG_CONFIG" != "no" ; then
       tqt_incdirs="$tqt_incdirs `$PKG_CONFIG --variable=includedir tqt-mt`"
   fi
 fi
-tqt_incdirs="$TQTINC $tqt_incdirs /usr/include/tqt3 /usr/include /usr/X11R6/include/X11/tqt /usr/X11R6/include/tqt $x_includes"
+tqt_incdirs="$TQTINC $tqt_incdirs /usr/include/tqt3 /usr/include/tqt /usr/include /usr/X11R6/include/X11/tqt /usr/X11R6/include/tqt $x_includes"
 if test ! "$ac_tqt_includes" = "NO"; then
    tqt_incdirs="$ac_tqt_includes $tqt_incdirs"
 fi
 
-kde_tqt_header=ntqstyle.h
-
+kde_tqt_header=tqstyle.h
 AC_FIND_FILE($kde_tqt_header, $tqt_incdirs, tqt_incdir)
-if test "$tqt_incdir" = "NO"; then
-   AC_FIND_FILE($kde_tqt_header, $tqt_incdirs, tqt_incdir)
-fi
 ac_tqt_includes="$tqt_incdir"
 
 tqt_libdirs=""
@@ -1524,9 +1486,9 @@ KDE_CHECK_TQT
 KDE_CHECK_TQT_JPEG
 
 if test "x$kde_use_tqt_emb" != "xyes" && test "x$kde_use_tqt_mac" != "xyes"; then
-LIB_TQT="$kde_int_tqt $LIBJPEG_TQT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) $(LIBTQT_LDFLAGS)'
+LIB_TQT="$kde_int_tqt $LIBJPEG_TQT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)'
 else
-LIB_TQT="$kde_int_tqt $LIBJPEG_TQT "'$(LIBZ) $(LIBPNG) $(LIBTQT_LDFLAGS)'
+LIB_TQT="$kde_int_tqt $LIBJPEG_TQT "'$(LIBZ) $(LIBPNG)'
 fi
 test -z "$KDE_MT_LIBS" || LIB_TQT="$LIB_TQT $KDE_MT_LIBS"
 for a in $tqt_libdir/lib`echo ${kde_int_tqt} | sed 's,^-l,,'`_incremental.*; do
@@ -2467,7 +2429,7 @@ AC_CACHE_VAL(kde_cv_tqt,
 AC_LANG_SAVE
 AC_LANG_CPLUSPLUS
 ac_save_LIBS="$LIBS"
-LIBS="$all_libraries $USER_LDFLAGS $LIBTQT -ltqt"
+LIBS="$all_libraries $USER_LDFLAGS $LIBTQT"
 ac_save_CXXFLAGS="$CXXFLAGS"
 CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
 if test "$kde_tqtver" -gt "2"; then
@@ -2488,23 +2450,10 @@ if eval "test ! \"`echo $kde_cv_tqt`\" = no"; then
   AC_MSG_RESULT(no)
 dnl  AC_MSG_ERROR([You are attempting to compile Trinity without the Trinity TQt Interface installed.  Please install libtqtinterface-dev and try again!])
   AC_MSG_WARN([You are attempting to compile Trinity without the Trinity TQt Interface installed.  Please install libtqtinterface-dev and try again!])
-  TQTMOC="\$PATH=\$PATH:\$(srcdir)/ tmoc"
-  LIBTQT_LDFLAGS="-ltqt"
-  AC_SUBST(LIBTQT_LDFLAGS)
-  tqtlib="$tqtlib $LIBTQT_LDFLAGS"
+  TQTMOC="\$PATH=\$PATH:\$(srcdir)/ tqmoc"
 else
   AC_MSG_RESULT(yes)
-  LIBTQT_LDFLAGS="-ltqt"
-  AC_SUBST(LIBTQT_LDFLAGS)
-dnl  all_libraries="$all_libraries $LIBTQT_LDFLAGS"
-  TQT_LDFLAGS="$TQT_LDFLAGS $LIBTQT_LDFLAGS"
-  AC_SUBST(TQT_LDFLAGS)
-  tqtlib="$tqtlib $LIBTQT_LDFLAGS"
-  LIBTQT_CXXFLAGS="-include tqt.h"
-  all_includes="$all_includes $LIBTQT_CXXFLAGS"
-  TQT_INCLUDES="$TQT_INCLUDES $LIBTQT_CXXFLAGS"
-
-  KDE_FIND_PATH(tmoc, TQTMOC, [$tqt_bindirs], [KDE_TQTMOC_ERROR_MESSAGE])
+  KDE_FIND_PATH(tqmoc, TQTMOC, [$tqt_bindirs], [KDE_TQTMOC_ERROR_MESSAGE])
   AC_SUBST(TQTMOC)
 
   KDE_FIND_PATH(dcopidl, TQTDCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl)])
@@ -2621,9 +2570,7 @@ else
 LIBS="$all_libraries $USER_LDFLAGS -l$1 $LIBJPEG $LIBZ -lm"
 fi
 kde_save_CXXFLAGS="$CXXFLAGS"
-kde_save_LDFLAGS="$LDFLAGS"
 CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
-LDFLAGS="$LDFLAGS -ltqt"
 
 AC_TRY_LINK(dnl
 [
@@ -2638,7 +2585,6 @@ AC_TRY_LINK(dnl
 
 LIBS="$kde_save_LIBS"
 CXXFLAGS="$kde_save_CXXFLAGS"
-LDFLAGS="$kde_save_LDFLAGS"
 AC_LANG_RESTORE
 ])
 
@@ -2700,8 +2646,6 @@ AC_CACHE_VAL(ac_cv_libexr,
            AC_LANG_SAVE
            AC_LANG_CPLUSPLUS
            kde_save_CXXFLAGS="$CXXFLAGS"
-           kde_save_LDFLAGS="$LDFLAGS"
-           LDFLAGS="$LFLAGS -ltqt"
            EXR_FLAGS=`$PKG_CONFIG --cflags OpenEXR`
            CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES $EXR_FLAGS"
 
@@ -2719,7 +2663,6 @@ AC_CACHE_VAL(ac_cv_libexr,
            )
            LIBS="$kde_save_LIBS"
            CXXFLAGS="$kde_save_CXXFLAGS"
-           LDFLAGS="$kde_save_LDFLAGS"
            AC_LANG_RESTORE
            ])dnl
            if eval "test ! \"`echo $ac_cv_libexr`\" = no"; then
@@ -3386,7 +3329,7 @@ fi
         CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
         KDE_CHECK_VISIBILITY_GCC_BUG
         HAVE_GCC_VISIBILITY=1
-        AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
+        AC_DEFINE_UNQUOTED(__TDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
       fi
     ])
   fi
@@ -4296,23 +4239,11 @@ AC_DEFUN([KDE_CHECK_LIBPTHREAD],
     fi
   fi
 
-  dnl Is this test really needed, in the face of the Tru64 test below?
+  dnl Is this test really needed?
   if test -z "$LIBPTHREAD"; then
     AC_CHECK_LIB(pthread, pthread_create, [LIBPTHREAD="-lpthread"])
   fi
 
-  dnl This is a special Tru64 check, see BR 76171 issue #18.
-  if test -z "$LIBPTHREAD" ; then
-    AC_MSG_CHECKING([for pthread_create in -lpthread])
-    kde_safe_libs=$LIBS
-    LIBS="$LIBS -lpthread"
-    AC_TRY_LINK([#include <pthread.h>],[(void)pthread_create(0,0,0,0);],[
-        AC_MSG_RESULT(yes)
-        LIBPTHREAD="-lpthread"],[
-	AC_MSG_RESULT(no)])
-    LIBS=$kde_safe_libs
-  fi
-
   dnl Un-special-case for FreeBSD.
   if test "x$LIBPTHREAD" = "xPTHREAD" ; then
     LIBPTHREAD=""
@@ -4555,7 +4486,7 @@ fi
 
 AC_DEFUN([KDE_CHECK_PYTHON],
 [
-  for PYTHON_VER_TEST in 3.{12,11,10,9,8,7,6,5,4,3,2,1,0}; do
+  for PYTHON_VER_TEST in 3.{13,12,11,10,9,8,7,6,5,4,3,2,1,0}; do
     KDE_CHECK_PYTHON_INTERN("$PYTHON_VER_TEST")
     if test -n "$PYTHONLIB"; then
       break
@@ -4820,7 +4751,7 @@ AC_LANG_RESTORE
 ])
 
 dnl ------------------------------------------------------------------------
-dnl Check for S_ISSOCK macro. Doesn't exist on Unix SCO. faure@kde.org
+dnl Check for S_ISSOCK macro
 dnl ------------------------------------------------------------------------
 dnl
 AC_DEFUN([AC_CHECK_S_ISSOCK],
@@ -4895,7 +4826,7 @@ AC_DEFINE_UNQUOTED(KDEMAXPATHLEN,$ac_cv_maxpathlen, [Define a safe value for MAX
 AC_DEFUN([KDE_CHECK_HEADER],
 [
    kde_safe_cppflags=$CPPFLAGS
-   CPPFLAGS="$CPPFLAGS $all_includes -I$kde_incdir/tde -I/usr/include/tqt"
+   CPPFLAGS="$CPPFLAGS $all_includes -I$kde_incdir/tde -I/usr/include/tqt3 -I/usr/include/tqt"
    AC_LANG_SAVE
    AC_LANG_CPLUSPLUS
    AC_CHECK_HEADER([$1], [$2], [$3], [$4])
@@ -4908,7 +4839,7 @@ AC_DEFUN([KDE_CHECK_HEADERS],
    AH_CHECK_HEADERS_TDE([$1])
    AC_LANG_SAVE
    kde_safe_cppflags=$CPPFLAGS
-   CPPFLAGS="$CPPFLAGS $all_includes -I$kde_incdir/tde -I/usr/include/tqt"
+   CPPFLAGS="$CPPFLAGS $all_includes -I$kde_incdir/tde -I/usr/include/tqt3 -I/usr/include/tqt"
    AC_LANG_CPLUSPLUS
    AC_CHECK_HEADERS([$1], [$2], [$3], [$4])
    CPPFLAGS=$kde_safe_cppflags
@@ -5116,7 +5047,6 @@ AC_DEFUN([KDE_CHECK_LIB],
      kde_save_LDFLAGS="$LDFLAGS"
      dnl AC_CHECK_LIB modifies LIBS, so save it here
      kde_save_LIBS="$LIBS"
-     LDFLAGS="$LDFLAGS $all_libraries -ltqt"
      case $host_os in
       aix*) LDFLAGS="-brtl $LDFLAGS"
 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
@@ -5549,7 +5479,7 @@ if test "${with_tqt_dir+set}" = set; then
   kde_tqtdir="$with_tqt_dir"
 fi
 
-AC_FIND_FILE(ntqsql.html, [ $kde_tqtdir/doc/html $TQTDIR/doc/html /usr/share/doc/packages/tqt3/html /usr/lib/tqt3/doc /usr/lib/tqt3/doc/html /usr/doc/tqt3/html /usr/doc/tqt3 /usr/share/doc/tqt3-doc /usr/share/tqt3/doc/html /usr/X11R6/share/doc/tqt/html ], TQTDOCDIR)
+AC_FIND_FILE(tqsql.html, [ $kde_tqtdir/doc/html $TQTDIR/doc/html /usr/share/doc/packages/tqt3/html /usr/lib/tqt3/doc /usr/lib/tqt3/doc/html /usr/doc/tqt3/html /usr/doc/tqt3 /usr/share/doc/tqt3-doc /usr/share/tqt3/doc/html /usr/X11R6/share/doc/tqt/html ], TQTDOCDIR)
 AC_MSG_RESULT($TQTDOCDIR)
 
 AC_SUBST(TQTDOCDIR)
@@ -5570,7 +5500,7 @@ AC_SUBST(DOXYGEN_PROJECT_NAME)
 AC_SUBST(DOXYGEN_PROJECT_NUMBER)
 
 KDE_HAS_DOXYGEN=no
-if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $TQTDOCDIR/ntqsql.html; then
+if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $TQTDOCDIR/tqsql.html; then
   KDE_HAS_DOXYGEN=yes
 fi
 AC_SUBST(KDE_HAS_DOXYGEN)