summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2018-09-17 23:20:12 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2018-09-17 23:20:12 +0900
commit769a00aee5b94e947f97624ba40683698644078b (patch)
treea52a190268070f886c092774a8cfe487209c2107
parentde49c7554e4beb4b9a7e66f6575ae33d668d717c (diff)
downloadkbiff-769a00aee5b94e947f97624ba40683698644078b.tar.gz
kbiff-769a00aee5b94e947f97624ba40683698644078b.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--kbiff/Makefile.am2
2 files changed, 10 insertions, 10 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 3b9c7db..35dbd81 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1601,19 +1601,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)
@@ -2125,7 +2125,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)")
@@ -5468,8 +5468,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"
@@ -5516,7 +5516,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/kbiff/Makefile.am b/kbiff/Makefile.am
index b3e6891..66e1a06 100644
--- a/kbiff/Makefile.am
+++ b/kbiff/Makefile.am
@@ -24,7 +24,7 @@ kbiff_la_LDFLAGS = $(all_libraries) -module -avoid-version
# the libraries to link against. Be aware of the order. First the libraries,
# that depend on the following ones.
-kbiff_la_LIBADD = $(LIB_KFILE) $(LIB_TDEIO) $(LIB_QT) $(LIB_TDECORE) -lDCOP $(LIB_TDEUI)
+kbiff_la_LIBADD = $(LIB_KFILE) $(LIB_TDEIO) $(LIB_TQT) $(LIB_TDECORE) -lDCOP $(LIB_TDEUI)
# this option you can leave out. Just, if you use "make dist", you need it
noinst_HEADERS = setupdlg.h kbiff.h kbiffmonitor.h notify.h kbiffurl.h \