summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--acinclude.m418
-rw-r--r--keep/app/Makefile.am2
-rw-r--r--keep/kded/Makefile.am2
3 files changed, 11 insertions, 11 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 42b41dc..2ebb359 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/keep/app/Makefile.am b/keep/app/Makefile.am
index 78cd105..4d9bfbb 100644
--- a/keep/app/Makefile.am
+++ b/keep/app/Makefile.am
@@ -12,7 +12,7 @@ keep_SOURCES = main.cpp keepmainwindow.cpp backuplistwidget.cpp\
addbackupwizard3view.ui restorebackupwizard1view.ui\
restorebackupwizard2view.ui restorebackupwizard3view.ui backuplistview.ui
keep_LDADD = $(top_builddir)/keep/common/libkeep.la $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEIO)
-keep_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+keep_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
noinst_HEADERS = keepmainwindow.h addbackupwizard.h logdialog.h\
restorebackupwizard.h forcebackupdialog.h\
diff --git a/keep/kded/Makefile.am b/keep/kded/Makefile.am
index f3719f2..e330094 100644
--- a/keep/kded/Makefile.am
+++ b/keep/kded/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/keep/common -I$(top_builddir)/keep/common $(all_inclu
kde_module_LTLIBRARIES = kded_keep.la
kded_keep_la_LDFLAGS = -module -avoid-version $(all_libraries)
-kded_keep_la_LIBADD = $(top_builddir)/keep/common/libkeep.la $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_QT) -lDCOP -ltdeinit_kded
+kded_keep_la_LIBADD = $(top_builddir)/keep/common/libkeep.la $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TQT) -lDCOP -ltdeinit_kded
kded_keep_la_SOURCES = keepkded.cpp keepkded.skel
noinst_HEADERS = keepkded.h