Don't explicetly include tqt.h anymore

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

1 files changed, 5 insertions, 25 deletions

diff --git a/acinclude.m4.in b/acinclude.m4.in
index 41da757..d942284 100644
--- a/acinclude.m4.in
+++ b/acinclude.m4.in
@@ -1076,13 +1076,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,
   )
@@ -1512,9 +1512,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
@@ -2455,7 +2455,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
@@ -2477,21 +2477,8 @@ if eval "test ! \"`echo $kde_cv_tqt`\" = no"; then
 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)/ tqmoc"
-  LIBTQT_LDFLAGS="-ltqt"
-  AC_SUBST(LIBTQT_LDFLAGS)
-  tqtlib="$tqtlib $LIBTQT_LDFLAGS"
 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(tqmoc, TQTMOC, [$tqt_bindirs], [KDE_TQTMOC_ERROR_MESSAGE])
   AC_SUBST(TQTMOC)
 
@@ -2609,9 +2596,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
 [
@@ -2626,7 +2611,6 @@ AC_TRY_LINK(dnl
 
 LIBS="$kde_save_LIBS"
 CXXFLAGS="$kde_save_CXXFLAGS"
-LDFLAGS="$kde_save_LDFLAGS"
 AC_LANG_RESTORE
 ])
 
@@ -2688,8 +2672,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"
 
@@ -2707,7 +2689,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
@@ -5104,7 +5085,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"