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

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

diff --git a/ChangeLog b/ChangeLog
index 261a562..b4c81fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -150,8 +150,8 @@ v0.1.3 - Last Changed Rev: 537369 - 2006-05-04
 	* trunk/extragear/libs/libkipi/libkipi/Makefile.am: libkipi: List
 	  _all_ libs in _LDADD from which libkipi needs symbols:
 	  -libkipi_la_LIBADD = $(LIB_KIO) $(LIB_KUI) +libkipi_la_LIBADD =
-	  $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) OT ;) at least
-	  for linux and shared libs the LIB_QT var (== -lqt-mt $(LIBZ)
+	  $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT) OT ;) at least
+	  for linux and shared libs the LIB_TQT var (== -lqt-mt $(LIBZ)
 	  $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread) is better
 	  replaced by -lqt-mt. Otherwise the loader adds 20 additional
 	  libraries as NEEDED to libkipi. CCMail:digikam-devel@kde.org
diff --git a/acinclude.m4 b/acinclude.m4
index 3cb011d..21379a0 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_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
@@ -5442,8 +5442,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"
 
@@ -5490,7 +5490,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/aclocal.m4 b/aclocal.m4
index 06f1e0b..054ef10 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1589,19 +1589,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)
@@ -2113,7 +2113,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_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
@@ -5454,8 +5454,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"
 
@@ -5502,7 +5502,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/libkipi/libkipi/Makefile.am b/libkipi/libkipi/Makefile.am
index 8a43bbb..52e6faf 100644
--- a/libkipi/libkipi/Makefile.am
+++ b/libkipi/libkipi/Makefile.am
@@ -18,7 +18,7 @@ libkipiinclude_HEADERS = interface.h plugin.h pluginloader.h imageinfo.h imageco
 libkipi_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) \
 		-version-info 1:1:1 -no-undefined
 
-libkipi_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
+libkipi_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT)
 
 libkipiincludedir = $(includedir)/libkipi
 
-- 
cgit v1.2.1