summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2018-09-17 23:20:13 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2018-09-17 23:20:13 +0900
commitb771b168bf67a5090e6b9d7e97438992ca6a3e5c (patch)
tree7aa89a2af73b9ea8ddbd6b5a6d55c67b7e2c704d
parent0a61e8c2576e4e4647aec32d2c2be7618a70b5d8 (diff)
downloadkchmviewer-b771b168bf67a5090e6b9d7e97438992ca6a3e5c.tar.gz
kchmviewer-b771b168bf67a5090e6b9d7e97438992ca6a3e5c.zip
LIB_QT -> LIB_TQT conversion to align to updated admin module
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r--acinclude.m418
-rw-r--r--configure.in2
-rw-r--r--configure.in.in2
-rw-r--r--lib/tdeio-msits/Makefile.am2
-rw-r--r--src/Makefile.am2
5 files changed, 13 insertions, 13 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index cad4483..3cb75e0 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/configure.in b/configure.in
index 704cc5d..9535417 100644
--- a/configure.in
+++ b/configure.in
@@ -101,7 +101,7 @@ else
echo "KDE support : disabled."
fi
echo "Qt includes : $QT_INCLUDES"
-echo "Qt libraries : $LIB_QT"
+echo "Qt libraries : $LIB_TQT"
echo "chmlib to link : $USE_LIB_CHM"
KDE_CREATE_SUBDIRSLIST
AC_CONFIG_FILES([ Makefile ])
diff --git a/configure.in.in b/configure.in.in
index 9fa5f8d..2aee9ba 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -100,5 +100,5 @@ else
echo "KDE support : disabled."
fi
echo "Qt includes : $QT_INCLUDES"
-echo "Qt libraries : $LIB_QT"
+echo "Qt libraries : $LIB_TQT"
echo "chmlib to link : $USE_LIB_CHM"
diff --git a/lib/tdeio-msits/Makefile.am b/lib/tdeio-msits/Makefile.am
index 37e1b64..97c150e 100644
--- a/lib/tdeio-msits/Makefile.am
+++ b/lib/tdeio-msits/Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = tdeio_msits.la
tdeio_msits_la_SOURCES = msits.cpp
tdeio_msits_la_LIBADD = -ltdeio $(CHM_LIBS)
-tdeio_msits_la_LDFLAGS = -module -avoid-version $(KDE_LDFLAGS) $(LIB_QT) $(LIB_TDEIO) $(LIB_TDECORE) $(KDE_PLUGIN) $(QT_LDFLAGS)
+tdeio_msits_la_LDFLAGS = -module -avoid-version $(KDE_LDFLAGS) $(LIB_TQT) $(LIB_TDEIO) $(LIB_TDECORE) $(KDE_PLUGIN) $(QT_LDFLAGS)
protocol_DATA = msits.protocol
protocoldir = $(kde_servicesdir)
diff --git a/src/Makefile.am b/src/Makefile.am
index 4bd0e12..69fca9e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,7 +19,7 @@ SUBDIRS = $(LIB_KDEEXTRADIR) . pics
# the library search path.
kchmviewer_LDADD = $(top_builddir)/lib/libchmfile/libchmfile.a $(LIB_KDEEXTRA) \
- $(CHM_LIBS) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDEHTML) $(LIB_TDEPARTS) $(LIB_TDEIO)
+ $(CHM_LIBS) $(LIB_TQT) $(LIB_TDEUI) $(LIB_TDEHTML) $(LIB_TDEPARTS) $(LIB_TDEIO)
kchmviewer_LDFLAGS = $(QT_LDFLAGS) $(KDE_LDFLAGS) $(LIB_TDECORE) -lDCOP $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDEIO) -L../lib/chmlib/
METASOURCES = AUTO