From 91c616dd6d83adbb5869b739932c4a0986686d9e Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Mon, 17 Sep 2018 23:20:38 +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 +++++++++---------
 src/Makefile.am                     |  4 ++--
 src/mplayerthumbsconfig/Makefile.am |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 7adab26..82fead0 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1577,19 +1577,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)
@@ -2101,7 +2101,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)")
@@ -5445,8 +5445,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"
 
@@ -5493,7 +5493,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/src/Makefile.am b/src/Makefile.am
index 4ad6dea..b947b42 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,7 +6,7 @@ SUBDIRS = . mplayerthumbsconfig
 kde_module_LTLIBRARIES = videopreview.la
 
 videopreview_la_SOURCES = videopreview.cpp mplayerthumbs.kcfgc
-videopreview_la_LDFLAGS = -avoid-version -module $(all_libraries) $(TDE_PLUGIN) $(LIB_QT)
+videopreview_la_LDFLAGS = -avoid-version -module $(all_libraries) $(TDE_PLUGIN) $(LIB_TQT)
 
 protocoldir = $(kde_servicesdir)
 
@@ -14,7 +14,7 @@ messages: rc.cpp
 	$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/videopreview.pot
 protocol_DATA = videopreview.desktop
-videopreview_la_LIBADD = $(LIB_TDECORE) -ltdefx $(LIB_QT)
+videopreview_la_LIBADD = $(LIB_TDECORE) -ltdefx $(LIB_TQT)
 
 videothumbnail_DATA = sprocket-small.png sprocket-medium.png sprocket-large.png
 videothumbnaildir = $(kde_datadir)/videopreview
diff --git a/src/mplayerthumbsconfig/Makefile.am b/src/mplayerthumbsconfig/Makefile.am
index 1cc43f7..d567719 100644
--- a/src/mplayerthumbsconfig/Makefile.am
+++ b/src/mplayerthumbsconfig/Makefile.am
@@ -8,4 +8,4 @@ bin_PROGRAMS = mplayerthumbsconfig
 mplayerthumbsconfig_LDFLAGS = $(KDE_RPATH) $(all_libraries)
 mplayerthumbsconfig_SOURCES = main.cpp mplayerthumbscfg.cpp
 noinst_HEADERS = mplayerthumbscfg.h
-mplayerthumbsconfig_LDADD = $(top_builddir)/src/videopreview.la $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
+mplayerthumbsconfig_LDADD = $(top_builddir)/src/videopreview.la $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT)
-- 
cgit v1.2.3