From c53d1891f357b8f6a32aa4acebb1560009b8dc16 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Mon, 17 Sep 2018 23:20:43 +0900
Subject: LIB_QT -> LIB_TQT conversion to align to updated admin module

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
---
 acinclude.m4           | 18 +++++++++---------
 tdeio_ftps/Makefile.am |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index c059091..3eb15ae 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1572,19 +1572,19 @@ AC_PATH_QT_MOC_UIC
 KDE_CHECK_QT_JPEG
 
 if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)'
+LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)'
 else
-LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)'
+LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)'
 fi
-test -z "$KDE_MT_LIBS" || LIB_QT="$LIB_QT $KDE_MT_LIBS"
+test -z "$KDE_MT_LIBS" || LIB_TQT="$LIB_TQT $KDE_MT_LIBS"
 for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
   if test -e "$a"; then
-     LIB_QT="$LIB_QT ${kde_int_qt}_incremental"
+     LIB_TQT="$LIB_TQT ${kde_int_qt}_incremental"
      break
   fi
 done
 
-AC_SUBST(LIB_QT)
+AC_SUBST(LIB_TQT)
 AC_SUBST(LIB_QPE)
 
 AC_SUBST(kde_qtver)
@@ -2096,7 +2096,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
 else
-   AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
+   AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_TQT)")
    AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
    AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
@@ -5296,8 +5296,8 @@ AC_DEFUN([AC_PATH_QTOPIA],
 
   AC_MSG_CHECKING([for Qtopia])
 
-  LIB_QTOPIA="-lqpe"
-  AC_SUBST(LIB_QTOPIA)
+  LIB_TQTOPIA="-lqpe"
+  AC_SUBST(LIB_TQTOPIA)
 
   kde_qtopia_dirs="$QPEDIR /opt/Qtopia"
 
@@ -5344,7 +5344,7 @@ is required.])
 
   CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes"
   LDFLAGS="$LDFLAGS $QT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
-  LIBS="$LIBS $LIB_QTOPIA $LIBQT"
+  LIBS="$LIBS $LIB_TQTOPIA $LIBQT"
 
   cat > conftest.$ac_ext <<EOF
 #include "confdefs.h"
diff --git a/tdeio_ftps/Makefile.am b/tdeio_ftps/Makefile.am
index f18fad9..29c8e55 100644
--- a/tdeio_ftps/Makefile.am
+++ b/tdeio_ftps/Makefile.am
@@ -19,7 +19,7 @@ tdeio_ftps_la_LIBADD = $(LIB_TDESYCOCA)
 # nicht wirklich als Bibliothek benutzt wird. $(KDE_PLUGIN) enth�t
 # Standardflags fr KDE Module, z.B. um die Versionsnummern zu unter-
 # drcken
-tdeio_ftps_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE)
+tdeio_ftps_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) $(LIB_TDECORE)
 
 # kde_services_ installiert in kde_servicesdir ($TDEDIR/share/services)
 # _DATA sind einfache Dateien
-- 
cgit v1.2.1