From cc74e9780f46ac90ed58ec53b700b745acb7ce4d Mon Sep 17 00:00:00 2001 From: Johannes Sixt Date: Sun, 23 Apr 2006 21:56:00 +0200 Subject: [PATCH] Removed the check for KDE 3. Now that KDE 4 is ante portas, we don't care about KDE 2 anymore. --- configure.in.mid | 21 --------------------- kdbg/Makefile.am | 8 +------- 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/configure.in.mid b/configure.in.mid index 7fdc1da..18a034d 100644 --- a/configure.in.mid +++ b/configure.in.mid @@ -124,24 +124,3 @@ AH_VERBATIM([SIZED_QString], # define FROM_LATIN1(cstr,len) QString::fromLatin1(cstr,len) # endif #endif]) - -dnl ----------------- -AC_MSG_CHECKING(for KDE 3) - -AC_LANG_CPLUSPLUS -ac_cxxflags_safe="$CXXFLAGS" -CXXFLAGS="$CXXFLAGS -I$qt_includes $all_includes" - -AC_TRY_COMPILE([ -#include -], [ -#if KDE_VERSION < 292 -give me an error, this is KDE 2 -#endif -], [this_is_kde3=yes],[this_is_kde3=no]) - -AM_CONDITIONAL(BUILD_FOR_KDE3, test x$this_is_kde3 = xyes) - -CXXFLAGS="$ac_cxxflags_safe" - -AC_MSG_RESULT($this_is_kde3) diff --git a/kdbg/Makefile.am b/kdbg/Makefile.am index 097c24a..48ae135 100644 --- a/kdbg/Makefile.am +++ b/kdbg/Makefile.am @@ -47,13 +47,7 @@ kdbg_LDFLAGS = \ $(all_libraries) $(KDE_RPATH) # the libraries to link against. -if BUILD_FOR_KDE3 -MYKDELIBS=$(LIB_KIO) -else -MYKDELIBS=$(LIB_KFILE) -endif - -kdbg_LDADD = $(MYKDELIBS) +kdbg_LDADD = $(LIB_KIO) # this option you can leave out. Just, if you use "make dist", you need it noinst_HEADERS = \ -- 2.11.4.GIT