diff options
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 163 |
1 files changed, 13 insertions, 150 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 7e75fe1..acc1c4b 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -476,11 +476,7 @@ if test "$1" = "default"; then kde_servicetypesdir='\${datadir}/servicetypes' fi if test -z "$kde_moduledir"; then - if test "$kde_qtver" = "2"; then - kde_moduledir='\${libdir}/kde2' - else - kde_moduledir='\${libdir}/kde3' - fi + kde_moduledir='\${libdir}/kde3' fi if test -z "$kde_styledir"; then kde_styledir='\${libdir}/kde3/plugins/styles' @@ -499,16 +495,6 @@ if test "$1" = "default"; then fi KDE_SET_PATHS(defaults) - -else - - if test $kde_qtver = 1; then - AC_MSG_RESULT([compiling]) - KDE_1_CHECK_PATHS - else - AC_MSG_ERROR([path checking not yet supported for KDE 2]) - fi - fi ]) @@ -713,13 +699,7 @@ AC_SUBST(kde_moduledir) AC_SUBST(tdeinitdir, '$(kde_moduledir)') AC_SUBST(kde_styledir) AC_SUBST(kde_widgetdir) -if test "$kde_qtver" = 1; then - kde_minidir="$kde_icondir/mini" -else -# for KDE 1 - this breaks KDE2 apps using minidir, but -# that's the plan ;-/ - kde_minidir="/dev/null" -fi +kde_minidir="/dev/null" dnl AC_SUBST(kde_minidir) dnl AC_SUBST(kde_cgidir) dnl AC_SUBST(kde_toolbardir) @@ -1095,22 +1075,6 @@ cat > conftest.$ac_ext <<EOF #include <ntqglobal.h> #include <ntqapplication.h> EOF -if test "$kde_qtver" = "2"; then -cat >> conftest.$ac_ext <<EOF -#include <ntqevent.h> -#include <ntqstring.h> -#include <ntqstyle.h> -EOF - -if test $kde_qtsubver -gt 0; then -cat >> conftest.$ac_ext <<EOF -#if TQT_VERSION < 210 -#error 1 -#endif -EOF -fi -fi - if test "$kde_qtver" = "3"; then cat >> conftest.$ac_ext <<EOF #include <ntqcursor.h> @@ -1126,18 +1090,6 @@ cat >> conftest.$ac_ext <<EOF int main() { EOF -if test "$kde_qtver" = "2"; then -cat >> conftest.$ac_ext <<EOF - QStringList *t = new QStringList(); - Q_UNUSED(t); -EOF -if test $kde_qtsubver -gt 0; then -cat >> conftest.$ac_ext <<EOF - TQString s; - s.setLatin1("Elvis is alive", 14); -EOF -fi -fi if test "$kde_qtver" = "3"; then cat >> conftest.$ac_ext <<EOF (void)QStyleFactory::create(TQString::null); @@ -1163,77 +1115,25 @@ else kde_qtsubver=1 fi kde_qtver=`echo "$1" | sed -e 's#^\([0-9][0-9]*\)\..*#\1#'` - if test "$kde_qtver" = "1"; then - kde_qtsubver=42 - fi fi if test -z "$2"; then - if test "$kde_qtver" = "2"; then - if test $kde_qtsubver -gt 0; then - kde_qt_minversion=">= Qt 2.2.2" - else - kde_qt_minversion=">= Qt 2.0.2" - fi - fi - if test "$kde_qtver" = "3"; then - if test $kde_qtsubver -gt 0; then - if test $kde_qtsubver -gt 1; then - if test $kde_qtsubver -gt 2; then - kde_qt_minversion=">= Qt 3.3 and < 4.0" - else - kde_qt_minversion=">= Qt 3.2 and < 4.0" - fi - else - kde_qt_minversion=">= Qt 3.1 (20021021) and < 4.0" - fi - else - kde_qt_minversion=">= Qt 3.0 and < 4.0" - fi - fi - if test "$kde_qtver" = "1"; then - kde_qt_minversion=">= 1.42 and < 2.0" - fi + kde_qt_minversion=">= Qt 3.3 and < 4.0" else kde_qt_minversion="$2" fi if test -z "$3"; then - if test $kde_qtver = 3; then - if test $kde_qtsubver -gt 0; then - kde_qt_verstring="TQT_VERSION >= 0x03@VER@00 && TQT_VERSION < 0x040000" - qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'` - kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"` - else - kde_qt_verstring="TQT_VERSION >= 300 && TQT_VERSION < 0x040000" - fi - fi - if test $kde_qtver = 2; then - if test $kde_qtsubver -gt 0; then - kde_qt_verstring="TQT_VERSION >= 222" - else - kde_qt_verstring="TQT_VERSION >= 200" - fi - fi - if test $kde_qtver = 1; then - kde_qt_verstring="TQT_VERSION >= 142 && TQT_VERSION < 200" - fi + kde_qt_verstring="TQT_VERSION >= 0x03@VER@00 && TQT_VERSION < 0x040000" + qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'` + kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"` else kde_qt_verstring="$3" fi -if test $kde_qtver = 4; then - kde_qt_dirs="$TQTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4" -fi if test $kde_qtver = 3; then kde_qt_dirs="$TQTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3" fi -if test $kde_qtver = 2; then - kde_qt_dirs="$TQTDIR /usr/lib/qt2 /usr/lib/qt" -fi -if test $kde_qtver = 1; then - kde_qt_dirs="$TQTDIR /usr/lib/qt" -fi ]) AC_DEFUN([KDE_CHECK_QT_DIRECT], @@ -1395,12 +1295,9 @@ else LIBTQT="-l$tqtlib" fi -if test $kde_qtver != 1; then - - AC_REQUIRE([AC_FIND_PNG]) - AC_REQUIRE([AC_FIND_JPEG]) - LIBTQT="$LIBTQT $LIBPNG $LIBJPEG" -fi +AC_REQUIRE([AC_FIND_PNG]) +AC_REQUIRE([AC_FIND_JPEG]) +LIBTQT="$LIBTQT $LIBPNG $LIBJPEG" if test $kde_qtver = 3; then AC_REQUIRE([KDE_CHECK_LIBDL]) @@ -1448,11 +1345,7 @@ if test ! "$ac_tqt_includes" = "NO"; then qt_incdirs="$ac_tqt_includes $qt_incdirs" fi -if test "$kde_qtver" != "1"; then - kde_qt_header=ntqstyle.h -else - kde_qt_header=ntqglobal.h -fi +kde_qt_header=ntqstyle.h AC_FIND_FILE($kde_qt_header, $qt_incdirs, qt_incdir) ac_tqt_includes="$qt_incdir" @@ -1783,13 +1676,8 @@ fi AC_CACHE_VAL(ac_cv_have_kde, [#try to guess kde locations -if test "$kde_qtver" = 1; then - kde_check_header="ksock.h" - kde_check_lib="libtdecore.la" -else - kde_check_header="ksharedptr.h" - kde_check_lib="libtdeio.la" -fi +kde_check_header="ksharedptr.h" +kde_check_lib="libtdeio.la" if test -z "$1"; then @@ -2088,24 +1976,6 @@ if test $kde_qtver = 3; then # these are for backward compatibility AC_SUBST(LIB_TDESYCOCA, "-ltdeio") AC_SUBST(LIB_KFILE, "-ltdeio") -elif test $kde_qtver = 2; then - AC_SUBST(LIB_TDECORE, "-ltdecore") - AC_SUBST(LIB_TDEUI, "-ltdeui") - AC_SUBST(LIB_TDEIO, "-ltdeio") - AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca") - AC_SUBST(LIB_SMB, "-lsmb") - AC_SUBST(LIB_KFILE, "-ltdefile") - AC_SUBST(LIB_KAB, "-lkab") - AC_SUBST(LIB_TDEHTML, "-ltdehtml") - AC_SUBST(LIB_TDESPELL, "-ltdespell") - AC_SUBST(LIB_TDEPARTS, "-ltdeparts") - AC_SUBST(LIB_TDEPRINT, "-ltdeprint") -else - 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)") - AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) @@ -2118,14 +1988,7 @@ AC_DEFUN([AC_PATH_KDE], then ac_use_path_checking="default" else ac_use_path_checking="" fi - ], - [ - if test "$kde_qtver" = 1; - then ac_use_path_checking="" - else ac_use_path_checking="default" - fi - ] - ) + ]) AC_CREATE_KFSSTND($ac_use_path_checking) |