TDE
/
keximdb
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/keximdb
0
0
Fork 0
Code Issues Releases Wiki Activity

qt -> tqt conversion:

Browse Source 
qtlib -> tqtlib
libqt -> libtqt
QTLIB -> TQTLIB
LIBQT -> LIBTQT

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/1/head
Michele Calgaro 6 years ago
parent 11124e7ac2
commit 3375dce5d0
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
1 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File

82
acinclude.m4
Unescape View File

@ -414,7 +414,7 @@ AC_DEFUN([KDE_1_CHECK_PATHS],
fi
AC_MSG_CHECKING([for TDE libraries installed])
ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5'
ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBTQT $KDE_TEST_RPATH 1>&5'
if AC_TRY_EVAL(ac_link) && test -s conftest; then
AC_MSG_RESULT(yes)
@ -1403,9 +1403,9 @@ ac_libs_safe="$LIBS"
CXXFLAGS="$CXXFLAGS -I$tqt_includes"
LDFLAGS="$LDFLAGS $X_LDFLAGS"
if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
LIBS="$LIBQT -lXext -lX11 $LIBSOCKET"
LIBS="$LIBTQT -lXext -lX11 $LIBSOCKET"
else
LIBS="$LIBQT $LIBSOCKET"
LIBS="$LIBTQT $LIBSOCKET"
fi
LD_LIBRARY_PATH=
export LD_LIBRARY_PATH
@ -1445,7 +1445,7 @@ fi
dnl ------------------------------------------------------------------------
dnl Try to find the Qt headers and libraries.
dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
dnl $(QT_LDFLAGS) will be -Ltqtliblocation (if needed)
dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
dnl ------------------------------------------------------------------------
dnl
@ -1502,18 +1502,18 @@ kde_qt_was_given=yes
dnl ------------------------------------------------------------------------
dnl If we haven't been told how to link to Qt, we work it out for ourselves.
dnl ------------------------------------------------------------------------
if test -z "$LIBQT_GLOB"; then
if test -z "$LIBTQT_GLOB"; then
if test "$kde_qtver" = "4"; then
LIBQT_GLOB="libQtCore.*"
LIBTQT_GLOB="libQtCore.*"
fi
if test "$kde_qtver" = "3"; then
if test "x$kde_use_qt_emb" = "xyes"; then
LIBQT_GLOB="libqte.*"
LIBTQT_GLOB="libtqte.*"
else
if $PKG_CONFIG --exists qt-mt ; then
LIBQT_GLOB="libqt.*"
LIBTQT_GLOB="libtqt.*"
else
LIBQT_GLOB="libtqt.*"
LIBTQT_GLOB="libtqt.*"
fi
fi
fi
@ -1524,21 +1524,21 @@ dnl If we got --enable-embedded then adjust the Qt library name.
dnl Also Qt4 uses a different library name
dnl ------------------------------------------------------------
if test "$kde_qtver" = "4"; then
qtlib="QtCore -lQtGui -lQtNetwork -ltqt"
tqtlib="QtCore -lQtGui -lQtNetwork -ltqt"
fi
if test "$kde_qtver" = "3"; then
if test "x$kde_use_qt_emb" = "xyes"; then
qtlib="qte"
tqtlib="qte"
else
if $PKG_CONFIG --exists qt-mt ; then
qtlib="qt"
tqtlib="qt"
else
qtlib="tqt"
tqtlib="tqt"
fi
fi
fi
kde_int_qt="-l$qtlib"
kde_int_qt="-l$tqtlib"
if test -z "$LIBQPE"; then
dnl ------------------------------------------------------------
@ -1561,40 +1561,40 @@ dnl ------------------------------------------------------------------------
if test "x$kde_use_qt_mt" = "xyes"; then
if test $kde_qtver = 3; then
LIBQT="-l$qtlib-mt"
kde_int_qt="-l$qtlib-mt"
LIBQT_GLOB="lib$qtlib-mt.*"
LIBTQT="-l$tqtlib-mt"
kde_int_qt="-l$tqtlib-mt"
LIBTQT_GLOB="lib$tqtlib-mt.*"
else
if test $kde_qtver = 4; then
LIBQT="-l$qtlib"
LIBTQT="-l$tqtlib"
fi
fi
USING_QT_MT="using -mt"
else
LIBQT="-l$qtlib"
LIBTQT="-l$tqtlib"
fi
if test $kde_qtver != 1; then
AC_REQUIRE([AC_FIND_PNG])
AC_REQUIRE([AC_FIND_JPEG])
LIBQT="$LIBQT $LIBPNG $LIBJPEG"
LIBTQT="$LIBTQT $LIBPNG $LIBJPEG"
fi
if test $kde_qtver = 3; then
AC_REQUIRE([KDE_CHECK_LIBDL])
LIBQT="$LIBQT $LIBDL"
LIBTQT="$LIBTQT $LIBDL"
fi
if test $kde_qtver = 4; then
AC_REQUIRE([KDE_CHECK_LIBDL])
LIBQT="$LIBQT $LIBDL"
LIBTQT="$LIBTQT $LIBDL"
fi
AC_MSG_CHECKING([for Qt])
if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET"
LIBTQT="$LIBTQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET"
fi
ac_tqt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO
qt_libraries=""
@ -1678,21 +1678,21 @@ if test "$PKG_CONFIG" != "no" ; then
fi
fi
fi
qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
qt_libdirs="$TQTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
if test ! "$ac_qt_libraries" = "NO"; then
qt_libdir=$ac_qt_libraries
else
qt_libdirs="$ac_qt_libraries $qt_libdirs"
# if the Qt was given, the chance is too big that libqt.* doesn't exist
# if the Qt was given, the chance is too big that libtqt.* doesn't exist
qt_libdir=NONE
for dir in $qt_libdirs; do
try="ls -1 $dir/${LIBQT_GLOB}"
try="ls -1 $dir/${LIBTQT_GLOB}"
if test -n "`$try 2> /dev/null`"; then qt_libdir=$dir; break; else echo "tried $dir" >&AC_FD_CC ; fi
done
fi
for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
if test -e "$a"; then
LIBQT="$LIBQT ${kde_int_qt}_incremental"
LIBTQT="$LIBTQT ${kde_int_qt}_incremental"
break
fi
done
@ -1708,7 +1708,7 @@ ac_libs_safe="$LIBS"
CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
LDFLAGS="$LDFLAGS -L$qt_libdir $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
LIBS="$LIBS $LIBQT $KDE_MT_LIBS"
LIBS="$LIBS $LIBTQT $KDE_MT_LIBS"
KDE_PRINT_QT_PROGRAM
@ -1739,9 +1739,9 @@ if test "$ac_tqt_includes" = NO || test "$ac_qt_libraries" = NO; then
if test "x$kde_use_qt_mt" = "xyes"; then
missing_qt_mt="
Make sure that you have compiled Qt with thread support!"
ac_qt_notfound="(library $qtlib-mt)";
ac_qt_notfound="(library $tqtlib-mt)";
else
ac_qt_notfound="(library $qtlib)";
ac_qt_notfound="(library $tqtlib)";
fi
fi
@ -2248,7 +2248,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
kde_libs_safe="$LIBS"
kde_cxxflags_safe="$CXXFLAGS"
LIBS="-lkde-qt-addon $LIBQT $LIBS"
LIBS="-lkde-qt-addon $LIBTQT $LIBS"
CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes"
LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
@ -2865,7 +2865,7 @@ AC_CACHE_VAL(kde_cv_tqt,
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
ac_save_LIBS="$LIBS"
LIBS="$all_libraries $USER_LDFLAGS $LIBQT -ltqt"
LIBS="$all_libraries $USER_LDFLAGS $LIBTQT -ltqt"
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
if test "$kde_qtver" -gt "2"; then
@ -2889,7 +2889,7 @@ dnl AC_MSG_ERROR([You are attempting to compile Trinity without the Trinity Qt
TQTMOC="\$PATH=\$PATH:\$(srcdir)/ tmoc"
LIBTQT_LDFLAGS="-ltqt"
AC_SUBST(LIBTQT_LDFLAGS)
qtlib="$qtlib $LIBTQT_LDFLAGS"
tqtlib="$tqtlib $LIBTQT_LDFLAGS"
else
AC_MSG_RESULT(yes)
LIBTQT_LDFLAGS="-ltqt"
@ -2897,7 +2897,7 @@ else
dnl all_libraries="$all_libraries $LIBTQT_LDFLAGS"
QT_LDFLAGS="$QT_LDFLAGS $LIBTQT_LDFLAGS"
AC_SUBST(QT_LDFLAGS)
qtlib="$qtlib $LIBTQT_LDFLAGS"
tqtlib="$tqtlib $LIBTQT_LDFLAGS"
LIBTQT_CXXFLAGS="-include tqt.h"
all_includes="$all_includes $LIBTQT_CXXFLAGS"
TQT_INCLUDES="$TQT_INCLUDES $LIBTQT_CXXFLAGS"
@ -2929,7 +2929,7 @@ AC_CACHE_VAL(kde_cv_qt_jpeg,
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
ac_save_LIBS="$LIBS"
LIBS="$all_libraries $USER_LDFLAGS $LIBQT"
LIBS="$all_libraries $USER_LDFLAGS $LIBTQT"
LIBS=`echo $LIBS | sed "s/$LIBJPEG//"`
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
@ -5087,7 +5087,7 @@ ac_save_LIBS="$LIBS"
ac_save_CXXFLAGS="$CXXFLAGS"
if test "$kde_qtver" = "3"; then
LIBS="$all_libraries -lqimgio -lpng -lz $LIBJPEG $LIBQT"
LIBS="$all_libraries -lqimgio -lpng -lz $LIBJPEG $LIBTQT"
CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
if $PKG_CONFIG --exists qt-mt ; then
AC_TRY_RUN(dnl
@ -5121,7 +5121,7 @@ fi
fi
if test "$kde_qtver" = "4"; then
LIBS="$all_libraries -lpng -lz $LIBJPEG $LIBQT"
LIBS="$all_libraries -lpng -lz $LIBJPEG $LIBTQT"
CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
AC_TRY_RUN(dnl
[
@ -5990,7 +5990,7 @@ is required.])
CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes"
LDFLAGS="$LDFLAGS $QT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
LIBS="$LIBS $LIB_TQTOPIA $LIBQT"
LIBS="$LIBS $LIB_TQTOPIA $LIBTQT"
cat > conftest.$ac_ext <<EOF
#include "confdefs.h"
@ -6804,9 +6804,9 @@ AC_DEFUN([AC_SQLITE3], [
if test ! $enable_sqlite3 = no; then
# determine name and path of sqlite3 plugin library
qtlib=""
tqtlib=""
if test ! "lib${tdelibsuff}" = "lib"; then
qtlib=".lib64"
tqtlib=".lib64"
fi
if test x$QTDIR = x; then
QTDIR=`dirname $MOC`
@ -6824,7 +6824,7 @@ AC_DEFUN([AC_SQLITE3], [
if test "x$qt_plugins_dir" = "x"; then
qt_plugins_dir=${QTDIR}/plugins
fi
LIBSQLITE3=${qt_plugins_dir}/sqldrivers/libqsqlite3${qtlib}.so
LIBSQLITE3=${qt_plugins_dir}/sqldrivers/libqsqlite3${tqtlib}.so
# do the checks
if test $enable_sqlite3 = auto; then

Write Preview
Loading…
Cancel
Save