diff --git a/acinclude.m4.in b/acinclude.m4.in index 0dd2272..8f5e9d5 100644 --- a/acinclude.m4.in +++ b/acinclude.m4.in @@ -1042,12 +1042,6 @@ EOF if test "$kde_tqtver" = "3"; then if $PKG_CONFIG --exists tqt-mt ; then cat >> conftest.$ac_ext < -#include -#include -EOF -else -cat >> conftest.$ac_ext < #include EOF @@ -1057,12 +1051,6 @@ fi if test "$kde_tqtver" = "3"; then if $PKG_CONFIG --exists tqt-mt ; then cat >> conftest.$ac_ext < -#include -#include -EOF -else -cat >> conftest.$ac_ext < #include #include @@ -1079,11 +1067,6 @@ int main() { EOF if test "$kde_tqtver" = "3"; then if $PKG_CONFIG --exists tqt-mt ; then -cat >> conftest.$ac_ext <> conftest.$ac_ext < - ], - [ - QDomDocument doc; - ], - kde_cv_have_kdetqtaddon=yes, - kde_cv_have_kdetqtaddon=no - ) -else AC_TRY_LINK([ #include ], @@ -2588,15 +2544,6 @@ CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES" if test "$kde_tqtver" = "3"; then if $PKG_CONFIG --exists tqt-mt ; then AC_TRY_LINK( -[#include ], - [ - 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 ], [ int argc; @@ -3454,17 +3401,6 @@ if test "$kde_tqtver" = "3"; then if $PKG_CONFIG --exists tqt-mt ; then AC_TRY_COMPILE( [ -#include -#include -#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 #if Q_EXPORT - 0 != 0 /* 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 AC_TRY_RUN(dnl [ -#include -#include -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 #include int main() { @@ -6455,10 +6377,6 @@ AC_DEFUN([AC_SQLITE3], [ if test "$PKG_CONFIG" != "no" ; then if $PKG_CONFIG --exists tqt-mt ; then 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 if test "x$tqt_plugins_dir" = "x"; then