TDE
/
tde-common-admin
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-common-admin
0
0
Fork 0
Code Issues Releases Wiki Activity

Fixed mistakes in previous commit related to test for tqt-mt.

Browse Source 
Thanks to Slávek Banko for review the proposed code :-)

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/2/head
Michele Calgaro 6 years ago committed by Slávek Banko
parent 7ed4760de4
commit e9de3f5ab0
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668
1 changed files with 1 additions and 83 deletions
Show Stats Download Patch File Download Diff File

82
acinclude.m4.in
Unescape View File

@ -1042,12 +1042,6 @@ EOF
if test "$kde_tqtver" = "3"; then if test "$kde_tqtver" = "3"; then
if $PKG_CONFIG --exists tqt-mt ; then if $PKG_CONFIG --exists tqt-mt ; then
cat >> conftest.$ac_ext <<EOF cat >> conftest.$ac_ext <<EOF
#include <tqt.h>
#include <qglobal.h>
#include <qapplication.h>
EOF
else
cat >> conftest.$ac_ext <<EOF
#include <tqglobal.h> #include <tqglobal.h>
#include <tqapplication.h> #include <tqapplication.h>
EOF EOF
@ -1057,12 +1051,6 @@ fi
if test "$kde_tqtver" = "3"; then if test "$kde_tqtver" = "3"; then
if $PKG_CONFIG --exists tqt-mt ; then if $PKG_CONFIG --exists tqt-mt ; then
cat >> conftest.$ac_ext <<EOF cat >> conftest.$ac_ext <<EOF
#include <qcursor.h>
#include <qstylefactory.h>
#include <private/qucomextra_p.h>
EOF
else
cat >> conftest.$ac_ext <<EOF
#include <tqcursor.h> #include <tqcursor.h>
#include <tqstylefactory.h> #include <tqstylefactory.h>
#include <tqucomextra_p.h> #include <tqucomextra_p.h>
@ -1079,11 +1067,6 @@ int main() {
EOF EOF
if test "$kde_tqtver" = "3"; then if test "$kde_tqtver" = "3"; then
if $PKG_CONFIG --exists tqt-mt ; then if $PKG_CONFIG --exists tqt-mt ; then
cat >> conftest.$ac_ext <<EOF
(void)QStyleFactory::create(QString::null);
QCursor c(TQt::WhatsThisCursor);
EOF
else
cat >> conftest.$ac_ext <<EOF cat >> conftest.$ac_ext <<EOF
(void)TQStyleFactory::create(TQString::null); (void)TQStyleFactory::create(TQString::null);
TQCursor c(TQt::WhatsThisCursor); TQCursor c(TQt::WhatsThisCursor);
@ -1177,10 +1160,6 @@ if test $kde_tqtver = 3; then
fi fi
if test "$PKG_CONFIG" != "no" ; then if test "$PKG_CONFIG" != "no" ; then
if $PKG_CONFIG --exists tqt-mt ; then if $PKG_CONFIG --exists tqt-mt ; then
kde_tqt_dirs="$kde_tqt_dirs `$PKG_CONFIG --variable=prefix tqt-mt`"
LIB_QUI="-lqui"
AC_SUBST(LIB_QUI)
else
if $PKG_CONFIG --exists tqt-mt ; then if $PKG_CONFIG --exists tqt-mt ; then
kde_tqt_dirs="$kde_tqt_dirs `$PKG_CONFIG --variable=prefix tqt-mt`" kde_tqt_dirs="$kde_tqt_dirs `$PKG_CONFIG --variable=prefix tqt-mt`"
LIB_QUI="-ltqui" LIB_QUI="-ltqui"
@ -1310,8 +1289,6 @@ if test -z "$LIBTQT_GLOB"; then
else else
if $PKG_CONFIG --exists tqt-mt ; then if $PKG_CONFIG --exists tqt-mt ; then
LIBTQT_GLOB="libtqt.*" LIBTQT_GLOB="libtqt.*"
else
LIBTQT_GLOB="libtqt.*"
fi fi
fi fi
fi fi
@ -1327,8 +1304,6 @@ if test "$kde_tqtver" = "3"; then
else else
if $PKG_CONFIG --exists tqt-mt ; then if $PKG_CONFIG --exists tqt-mt ; then
tqtlib="tqt" tqtlib="tqt"
else
tqtlib="tqt"
fi fi
fi fi
fi fi
@ -1419,10 +1394,6 @@ fi
if test "$PKG_CONFIG" != "no" ; then if test "$PKG_CONFIG" != "no" ; then
if $PKG_CONFIG --exists tqt-mt ; then if $PKG_CONFIG --exists tqt-mt ; then
tqt_incdirs="$tqt_incdirs `$PKG_CONFIG --variable=includedir tqt-mt`" tqt_incdirs="$tqt_incdirs `$PKG_CONFIG --variable=includedir tqt-mt`"
else
if $PKG_CONFIG --exists tqt-mt ; then
tqt_incdirs="$tqt_incdirs `$PKG_CONFIG --variable=includedir tqt-mt`"
fi
fi fi
fi fi
tqt_incdirs="$TQTINC $tqt_incdirs /usr/include/tqt3 /usr/include /usr/X11R6/include/X11/tqt /usr/X11R6/include/tqt $x_includes" tqt_incdirs="$TQTINC $tqt_incdirs /usr/include/tqt3 /usr/include /usr/X11R6/include/X11/tqt /usr/X11R6/include/tqt $x_includes"
@ -1430,7 +1401,6 @@ if test ! "$ac_tqt_includes" = "NO"; then
tqt_incdirs="$ac_tqt_includes $tqt_incdirs" tqt_incdirs="$ac_tqt_includes $tqt_incdirs"
fi fi
kde_tqt_header=qstyle.h
kde_tqt_header=ntqstyle.h kde_tqt_header=ntqstyle.h
AC_FIND_FILE($kde_tqt_header, $tqt_incdirs, tqt_incdir) AC_FIND_FILE($kde_tqt_header, $tqt_incdirs, tqt_incdir)
@ -1449,10 +1419,6 @@ fi
if test "$PKG_CONFIG" != "no" ; then if test "$PKG_CONFIG" != "no" ; then
if $PKG_CONFIG --exists tqt-mt ; then if $PKG_CONFIG --exists tqt-mt ; then
tqt_libdirs="$tqt_incdirs `$PKG_CONFIG --variable=libdir tqt-mt`" tqt_libdirs="$tqt_incdirs `$PKG_CONFIG --variable=libdir tqt-mt`"
else
if $PKG_CONFIG --exists tqt-mt ; then
tqt_libdirs="$tqt_incdirs `$PKG_CONFIG --variable=libdir tqt-mt`"
fi
fi fi
fi fi
tqt_libdirs="$TQTLIB $tqt_libdirs /usr/X11R6/lib /usr/lib /usr/local/tqt/lib $x_libraries" tqt_libdirs="$TQTLIB $tqt_libdirs /usr/X11R6/lib /usr/lib /usr/local/tqt/lib $x_libraries"
@ -1971,16 +1937,6 @@ AC_CACHE_VAL(kde_cv_have_kdetqtaddon,
if test "$kde_tqtver" = "3"; then if test "$kde_tqtver" = "3"; then
if $PKG_CONFIG --exists tqt-mt ; then if $PKG_CONFIG --exists tqt-mt ; then
AC_TRY_LINK([
#include <qdom.h>
],
[
QDomDocument doc;
],
kde_cv_have_kdetqtaddon=yes,
kde_cv_have_kdetqtaddon=no
)
else
AC_TRY_LINK([ AC_TRY_LINK([
#include <tqdom.h> #include <tqdom.h>
], ],
@ -2588,15 +2544,6 @@ CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
if test "$kde_tqtver" = "3"; then if test "$kde_tqtver" = "3"; then
if $PKG_CONFIG --exists tqt-mt ; then if $PKG_CONFIG --exists tqt-mt ; then
AC_TRY_LINK( AC_TRY_LINK(
[#include <qapplication.h>],
[
int argc;
char** argv;
QApplication app(argc, argv);],
eval "kde_cv_tqt_jpeg=no",
eval "kde_cv_tqt_jpeg=yes")
else
AC_TRY_LINK(
[#include <tqapplication.h>], [#include <tqapplication.h>],
[ [
int argc; int argc;
@ -3454,17 +3401,6 @@ if test "$kde_tqtver" = "3"; then
if $PKG_CONFIG --exists tqt-mt ; then if $PKG_CONFIG --exists tqt-mt ; then
AC_TRY_COMPILE( AC_TRY_COMPILE(
[ [
#include <tqt.h>
#include <qglobal.h>
#if Q_EXPORT - 0 != 0
/* if this compiles, then Q_EXPORT is undefined */
/* if Q_EXPORT is nonempty, this will break compilation */
#endif
], [/* elvis is alive */],
kde_cv_val_tqt_gcc_visibility_patched=no, kde_cv_val_tqt_gcc_visibility_patched=yes)
else
AC_TRY_COMPILE(
[
#include <tqglobal.h> #include <tqglobal.h>
#if Q_EXPORT - 0 != 0 #if Q_EXPORT - 0 != 0
/* if this compiles, then Q_EXPORT is undefined */ /* if this compiles, then Q_EXPORT is undefined */
@ -4722,20 +4658,6 @@ CXXFLAGS="$CXXFLAGS -I$tqt_incdir $all_includes"
if $PKG_CONFIG --exists tqt-mt ; then if $PKG_CONFIG --exists tqt-mt ; then
AC_TRY_RUN(dnl AC_TRY_RUN(dnl
[ [
#include <qimageio.h>
#include <qstring.h>
int main() {
QString t = "hallo";
t.fill('t');
qInitImageIO();
}
],
ac_cv_lib_qimgio=yes,
ac_cv_lib_qimgio=no,
ac_cv_lib_qimgio=no)
else
AC_TRY_RUN(dnl
[
#include <tqimageio.h> #include <tqimageio.h>
#include <tqstring.h> #include <tqstring.h>
int main() { int main() {
@ -6455,10 +6377,6 @@ AC_DEFUN([AC_SQLITE3], [
if test "$PKG_CONFIG" != "no" ; then if test "$PKG_CONFIG" != "no" ; then
if $PKG_CONFIG --exists tqt-mt ; then if $PKG_CONFIG --exists tqt-mt ; then
tqt_plugins_dir="`pkg-config --variable=pluginsdir tqt-mt`" tqt_plugins_dir="`pkg-config --variable=pluginsdir tqt-mt`"
else
if $PKG_CONFIG --exists tqt-mt ; then
tqt_plugins_dir="`pkg-config --variable=pluginsdir tqt-mt`"
fi
fi fi
fi fi
if test "x$tqt_plugins_dir" = "x"; then if test "x$tqt_plugins_dir" = "x"; then

Write Preview
Loading…
Cancel
Save