No longer using KDE, so remove KDE autoconf gubbins.

29 files changed, 0 insertions, 1554 deletions

diff --git a/conf/m4/kde/AC_BASE_PATH_KDE.m4 b/conf/m4/kde/AC_BASE_PATH_KDE.m4
deleted file mode 100644
index dbc9f9d..0000000
--- a/conf/m4/kde/AC_BASE_PATH_KDE.m4
+++ /dev/null
@@ -1,131 +0,0 @@
-dnl ------------------------------------------------------------------------
-dnl Now, the same with KDE
-dnl $(KDE_LDFLAGS) will be the kdeliblocation (if needed)
-dnl and $(kde_includes) will be the kdehdrlocation (if needed)
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_BASE_PATH_KDE],
-[
-AC_PREREQ([2.13])
-AC_REQUIRE([KDE_MISC_TESTS])
-AC_REQUIRE([AC_PATH_QT])dnl
-AC_CHECK_RPATH
-AC_MSG_CHECKING([for KDE])
-
-if test "${kde_prefix}" != NONE; then
-  kde_includes=${kde_prefix}/include
-  ac_kde_includes=$kde_prefix/include
-
-  if test "${kde_exec_prefix}" != NONE; then
-    kde_libraries=${kde_exec_prefix}/lib
-    ac_kde_libraries=$kde_exec_prefix/lib
-  else
-    kde_libraries=${kde_prefix}/lib
-    ac_kde_libraries=$kde_prefix/lib
-  fi
-else
-  ac_kde_includes=
-  ac_kde_libraries=
-  kde_libraries=""
-  kde_includes=""
-fi
-
-AC_CACHE_VAL(ac_cv_have_kde,
-[#try to guess kde locations
-
-if test -z "$1"; then
-
-kde_incdirs="$kde_prefix/include /opt/kde2/include /usr/kde2/include /usr/lib/kde/include /usr/local/kde/include /usr/kde/include /usr/include/kde /usr/include /opt/kde/include $x_includes $qt_includes"
-test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR $kde_incdirs"
-kde_incdirs="$ac_kde_includes $kde_incdirs"
-AC_FIND_FILE(ksock.h, $kde_incdirs, kde_incdir)
-ac_kde_includes="$kde_incdir"
-
-if test -n "$ac_kde_includes" && test ! -r "$ac_kde_includes/ksock.h"; then
-  AC_MSG_ERROR([
-in the prefix, you've chosen, are no KDE headers installed. This will fail.
-So, check this please and use another prefix!])
-fi
-
-kde_libdirs="$kde_prefix/lib /opt/kde2/lib /usr/kde2/lib /usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib /usr/X11R6/lib /opt/kde/lib /usr/X11R6/kde/lib"
-test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib $KDEDIR $kde_libdirs"
-kde_libdirs="$ac_kde_libraries $kde_libdirs"
-AC_FIND_FILE(libkdecore.la, $kde_libdirs, kde_libdir)
-ac_kde_libraries="$kde_libdir"
-
-if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/libkdecore.la"; then
-AC_MSG_ERROR([
-in the prefix, you've chosen, are no KDE libraries installed. This will fail.
-So, check this please and use another prefix!])
-fi
-ac_kde_libraries="$kde_libdir"
-
-if test "$ac_kde_includes" = NO || test "$ac_kde_libraries" = NO; then
-  ac_cv_have_kde="have_kde=no"
-else
-  ac_cv_have_kde="have_kde=yes \
-    ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
-fi
-
-else dnl test -z $1
-
-  ac_cv_have_kde="have_kde=no"
-
-fi
-])dnl
-
-eval "$ac_cv_have_kde"
-
-if test "$have_kde" != "yes"; then
- if test "${kde_prefix}" = NONE; then
-  ac_kde_prefix="$ac_default_prefix"
- else
-  ac_kde_prefix="$kde_prefix"
- fi
- if test "$kde_exec_prefix" = NONE; then
-  ac_kde_exec_prefix="$ac_kde_prefix"
-  AC_MSG_RESULT([will be installed in $ac_kde_prefix])
- else
-  ac_kde_exec_prefix="$exec_prefix"
-  AC_MSG_RESULT([will be installed in $ac_kde_prefix and $ac_kde_exec_prefix])
- fi
-
- kde_libraries="${ac_kde_exec_prefix}/lib"
- kde_includes=${ac_kde_prefix}/include
-
-else
-  ac_cv_have_kde="have_kde=yes \
-    ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
-  AC_MSG_RESULT([libraries $ac_kde_libraries, headers $ac_kde_includes])
-
-  kde_libraries="$ac_kde_libraries"
-  kde_includes="$ac_kde_includes"
-fi
-AC_SUBST(kde_libraries)
-AC_SUBST(kde_includes)
-
-if test "$kde_includes" = "$x_includes" || test "$kde_includes" = "$qt_includes" || test "$kde_includes" = "/usr/include" ; then
- KDE_INCLUDES=""
-else
- KDE_INCLUDES="-I$kde_includes"
- all_includes="$KDE_INCLUDES $all_includes"
-fi
-
-if test "$kde_libraries" = "$x_libraries" || test "$kde_libraries" = "$qt_libraries" || test "$kde_libraries" = "/usr/lib" ; then
- KDE_LDFLAGS=""
-else
- KDE_LDFLAGS="-L$kde_libraries"
- all_libraries="$KDE_LDFLAGS $all_libraries"
-fi
-
-AC_SUBST(KDE_LDFLAGS)
-AC_SUBST(KDE_INCLUDES)
-
-AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-
-AC_SUBST(all_includes)
-AC_SUBST(all_libraries)
-
-AC_SUBST(AUTODIRS)
-
-])
diff --git a/conf/m4/kde/AC_CHECK_KDEMAXPATHLEN.m4 b/conf/m4/kde/AC_CHECK_KDEMAXPATHLEN.m4
deleted file mode 100644
index 07f3dfb..0000000
--- a/conf/m4/kde/AC_CHECK_KDEMAXPATHLEN.m4
+++ /dev/null
@@ -1,35 +0,0 @@
-dnl ------------------------------------------------------------------------
-dnl Check for MAXPATHLEN macro, defines KDEMAXPATHLEN. faure@kde.org
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_CHECK_KDEMAXPATHLEN],
-[
-AC_MSG_CHECKING(for MAXPATHLEN)
-AC_CACHE_VAL(ac_cv_maxpathlen,
-[
-AC_LANG_C
-cat > conftest.$ac_ext <<EOF
-#include <stdio.h>
-#include <sys/param.h>
-#ifndef MAXPATHLEN
-#define MAXPATHLEN 1024
-#endif
-
-KDE_HELLO MAXPATHLEN
-
-EOF
-
-ac_try="$ac_cpp conftest.$ac_ext 2>/dev/null | grep '^KDE_HELLO' >conftest.out"
-
-if AC_TRY_EVAL(ac_try) && test -s conftest.out; then
-    ac_cv_maxpathlen=`sed 's#KDE_HELLO ##' conftest.out`
-else
-    ac_cv_maxpathlen=1024
-fi
-
-rm conftest.*
-
-])
-AC_MSG_RESULT($ac_cv_maxpathlen)
-AC_DEFINE_UNQUOTED(KDEMAXPATHLEN,$ac_cv_maxpathlen, [Define a safe value for MAXLENPATH] )
-])
diff --git a/conf/m4/kde/AC_CHECK_KSIZE_T.m4 b/conf/m4/kde/AC_CHECK_KSIZE_T.m4
deleted file mode 100644
index ed6454f..0000000
--- a/conf/m4/kde/AC_CHECK_KSIZE_T.m4
+++ /dev/null
@@ -1,44 +0,0 @@
-dnl Check for the type of the third argument of getsockname
-AC_DEFUN([AC_CHECK_KSIZE_T],
-[AC_MSG_CHECKING(for the third argument of getsockname)
-AC_CACHE_VAL(ac_cv_ksize_t,
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-[AC_TRY_COMPILE([
-#include <sys/types.h>
-#include <sys/socket.h>
-],[
-socklen_t a=0;
-getsockname(0,(struct sockaddr*)0, &a);
-],
-ac_cv_ksize_t=socklen_t,
-ac_cv_ksize_t=)
-if test -z "$ac_cv_ksize_t"; then
-ac_safe_cxxflags="$CXXFLAGS"
-if test "$GCC" = "yes"; then
-  CXXFLAGS="-Werror $CXXFLAGS"
-fi
-AC_TRY_COMPILE([
-#include <sys/types.h>
-#include <sys/socket.h>
-],[
-int a=0;
-getsockname(0,(struct sockaddr*)0, &a);
-],
-ac_cv_ksize_t=int,
-ac_cv_ksize_t=size_t)
-CXXFLAGS="$ac_safe_cxxflags"
-fi
-AC_LANG_RESTORE
-])
-
-if test -z "$ac_cv_ksize_t"; then
-  ac_cv_ksize_t=int
-fi
-
-AC_MSG_RESULT($ac_cv_ksize_t)
-AC_DEFINE_UNQUOTED(ksize_t, $ac_cv_ksize_t,
-      [Define the type of the third argument for getsockname]
-)
-
-])
diff --git a/conf/m4/kde/AC_CHECK_RPATH.m4 b/conf/m4/kde/AC_CHECK_RPATH.m4
deleted file mode 100644
index b698ca6..0000000
--- a/conf/m4/kde/AC_CHECK_RPATH.m4
+++ /dev/null
@@ -1,26 +0,0 @@
-AC_DEFUN([AC_CHECK_RPATH],
-[
-AC_MSG_CHECKING(for rpath)
-AC_ARG_ENABLE(rpath,
-      [  --disable-rpath         do not use the rpath feature of ld],
-      USE_RPATH=$enableval, USE_RPATH=yes)
-
-if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
-
-  KDE_RPATH="-R \$(kde_libraries)"
-
-  if test -n "$qt_libraries"; then
-    KDE_RPATH="$KDE_RPATH -R \$(qt_libraries)"
-  fi
-  dnl $x_libraries is set to /usr/lib in case
-  if test -n "$X_LDFLAGS"; then
-    KDE_RPATH="$KDE_RPATH -R \$(x_libraries)"
-  fi
-  if test -n "$KDE_EXTRA_RPATH"; then
-    KDE_RPATH="$KDE_RPATH \$(KDE_EXTRA_RPATH)"
-  fi
-fi
-AC_SUBST(KDE_EXTRA_RPATH)
-AC_SUBST(KDE_RPATH)
-AC_MSG_RESULT($USE_RPATH)
-])
diff --git a/conf/m4/kde/AC_CREATE_KFSSTND.m4 b/conf/m4/kde/AC_CREATE_KFSSTND.m4
deleted file mode 100644
index c86563d..0000000
--- a/conf/m4/kde/AC_CREATE_KFSSTND.m4
+++ /dev/null
@@ -1,95 +0,0 @@
-AC_DEFUN([AC_CREATE_KFSSTND],[
-	AC_REQUIRE([KDE_VERSION])
-	AC_MSG_CHECKING([for KDE paths])
-	kde_result=""
-
-	AC_CACHE_VAL(kde_cv_all_paths,[
-		if test -z "$kde_htmldir"; then
-			kde_htmldir='\$(kde_prefix)/share/doc/HTML'
-		fi
-		if test -z "$kde_appsdir"; then
-			kde_appsdir='\$(kde_prefix)/share/applnk'
-		fi
-		if test -z "$kde_icondir"; then
-			kde_icondir='\$(kde_prefix)/share/icons'
-		fi
-		if test -z "$kde_sounddir"; then
-			kde_sounddir='\$(kde_prefix)/share/sounds'
-		fi
-		if test -z "$kde_datadir"; then
-			kde_datadir='\$(kde_prefix)/share/apps'
-		fi
-		if test -z "$kde_locale"; then
-			kde_locale='\$(kde_prefix)/share/locale'
-		fi
-		if test -z "$kde_cgidir"; then
-			kde_cgidir='\$(kde_exec_prefix)/cgi-bin'
-		fi
-		if test -z "$kde_confdir"; then
-			kde_confdir='\$(kde_prefix)/share/config'
-		fi
-		if test -z "$kde_mimedir"; then
-			kde_mimedir='\$(kde_prefix)/share/mimelnk'
-		fi
-		if test -z "$kde_toolbardir"; then
-			kde_toolbardir='\$(kde_prefix)/share/toolbar'
-		fi
-		if test -z "$kde_wallpaperdir"; then
-			kde_wallpaperdir='\$(kde_prefix)/share/wallpapers'
-		fi
-		if test -z "$kde_bindir"; then
-			kde_bindir='\$(kde_exec_prefix)/bin'
-		fi
-		if test -z "$kde_servicesdir"; then
-			kde_servicesdir='\$(kde_prefix)/share/services'
-		fi
-		if test -z "$kde_servicetypesdir"; then
-			kde_servicetypesdir='\$(kde_prefix)/share/servicetypes'
-		fi
-		if test -z "$kde_moduledir"; then
-			kde_moduledir='\$(kde_exec_prefix)/lib/kde\$(kdeversion)'
-		fi
-
-		kde_cv_all_paths="kde_have_all_paths=\"yes\" \
-			kde_htmldir=\"$kde_htmldir\" \
-			kde_appsdir=\"$kde_appsdir\" \
-			kde_icondir=\"$kde_icondir\" \
-			kde_sounddir=\"$kde_sounddir\" \
-			kde_datadir=\"$kde_datadir\" \
-			kde_locale=\"$kde_locale\" \
-			kde_cgidir=\"$kde_cgidir\" \
-			kde_confdir=\"$kde_confdir\" \
-			kde_mimedir=\"$kde_mimedir\" \
-			kde_toolbardir=\"$kde_toolbardir\" \
-			kde_wallpaperdir=\"$kde_wallpaperdir\" \
-			kde_bindir=\"$kde_bindir\" \
-			kde_servicesdir=\"$kde_servicesdir\" \
-			kde_servicetypesdir=\"$kde_servicetypesdir\" \
-			kde_moduledir=\"$kde_moduledir\" \
-			kde_result=defaults"
-
-	])
-
-	eval "$kde_cv_all_paths"
-
-	if test -z "$kde_htmldir" || test -z "$kde_appsdir" ||
-		test -z "$kde_icondir" || test -z "$kde_sounddir" ||
-		test -z "$kde_datadir" || test -z "$kde_locale"  ||
-		test -z "$kde_cgidir"  || test -z "$kde_confdir" ||
-		test -z "$kde_mimedir" || test -z "$kde_toolbardir" ||
-		test -z "$kde_wallpaperdir" || test -z "$kde_bindir" ||
-		test -z "$kde_servicesdir" || test -z "$kde_moduledir" ||
-		test -z "$kde_servicetypesdir" ||
-		test "$kde_have_all_paths" != "yes"; then
-			kde_have_all_paths=no
-			AC_MSG_ERROR([configure could not run a little KDE program to test the environment.
-Since it had compiled and linked before, it must be a strange problem on your system.
-Look at config.log for details. If you are not able to fix this, look at
-http://www.kde.org/faq/installation.html or any www.kde.org mirror.
-(If you're using an egcs version on Linux, you may update binutils!)
-])
-		else
-			rm -f conftest*
-			AC_MSG_RESULT($kde_result)
-		fi
-])
diff --git a/conf/m4/kde/AC_FIND_FILE.m4 b/conf/m4/kde/AC_FIND_FILE.m4
deleted file mode 100644
index ee0af7f..0000000
--- a/conf/m4/kde/AC_FIND_FILE.m4
+++ /dev/null
@@ -1,18 +0,0 @@
-dnl ------------------------------------------------------------------------
-dnl Find a file (or one of more files in a list of dirs)
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_FIND_FILE],
-[
-$3=NO
-for i in $2;
-do
-  for j in $1;
-  do
-    if test -r "$i/$j"; then
-      $3=$i
-      break 2
-    fi
-  done
-done
-])
diff --git a/conf/m4/kde/AC_FIND_PNG.m4 b/conf/m4/kde/AC_FIND_PNG.m4
deleted file mode 100644
index 59a19d5..0000000
--- a/conf/m4/kde/AC_FIND_PNG.m4
+++ /dev/null
@@ -1,38 +0,0 @@
-AC_DEFUN([AC_FIND_PNG],
-[
-AC_REQUIRE([AC_FIND_ZLIB])
-AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-AC_MSG_CHECKING([for libpng])
-AC_CACHE_VAL(ac_cv_lib_png,
-[
-kde_save_LIBS="$LIBS"
-LIBS="$LIBS $all_libraries -lpng $LIBZ -lm -lX11 $LIBSOCKET"
-kde_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $all_includes"
-AC_LANG_C
-AC_TRY_LINK(dnl
-    [
-    #include<png.h>
-    ],
-    [
-    png_structp png_ptr = png_create_read_struct(  /* image ptr */
-		PNG_LIBPNG_VER_STRING, 0, 0, 0 );
-    return( png_ptr != 0 );
-    ],
-    eval "ac_cv_lib_png='-lpng $LIBZ -lm'",
-    eval "ac_cv_lib_png=no"
-)
-LIBS="$kde_save_LIBS"
-CFLAGS="$kde_save_CFLAGS"
-])dnl
-if eval "test ! \"`echo $ac_cv_lib_png`\" = no"; then
-  AC_DEFINE_UNQUOTED(HAVE_LIBPNG, 1, [Define if you have libpng])
-  LIBPNG="$ac_cv_lib_png"
-  AC_SUBST(LIBPNG)
-  AC_MSG_RESULT($ac_cv_lib_png)
-else
-  AC_MSG_RESULT(no)
-  LIBPNG=""
-  AC_SUBST(LIBPNG)
-fi
-])
diff --git a/conf/m4/kde/AC_FIND_ZLIB.m4 b/conf/m4/kde/AC_FIND_ZLIB.m4
deleted file mode 100644
index f355ad9..0000000
--- a/conf/m4/kde/AC_FIND_ZLIB.m4
+++ /dev/null
@@ -1,32 +0,0 @@
-AC_DEFUN([AC_FIND_ZLIB],
-[
-AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-AC_MSG_CHECKING([for libz])
-AC_CACHE_VAL(ac_cv_lib_z,
-[
-AC_LANG_C
-kde_save_LIBS="$LIBS"
-LIBS="$all_libraries -lz $LIBSOCKET"
-kde_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $all_includes"
-AC_TRY_LINK(dnl
-[
-#include<zlib.h>
-],
-            [return (zlibVersion() == ZLIB_VERSION); ],
-            eval "ac_cv_lib_z='-lz'",
-            eval "ac_cv_lib_z=no")
-LIBS="$kde_save_LIBS"
-CFLAGS="$kde_save_CFLAGS"
-])dnl
-if eval "test ! \"`echo $ac_cv_lib_z`\" = no"; then
-  AC_DEFINE_UNQUOTED(HAVE_LIBZ, 1, [Define if you have libz])
-  LIBZ="$ac_cv_lib_z"
-  AC_SUBST(LIBZ)
-  AC_MSG_RESULT($ac_cv_lib_z)
-else
-  AC_MSG_RESULT(no)
-  LIBZ=""
-  AC_SUBST(LIBZ)
-fi
-])
diff --git a/conf/m4/kde/AC_PATH_KDE.m4 b/conf/m4/kde/AC_PATH_KDE.m4
deleted file mode 100644
index ad4867e..0000000
--- a/conf/m4/kde/AC_PATH_KDE.m4
+++ /dev/null
@@ -1,24 +0,0 @@
-dnl
-AC_DEFUN([AC_PATH_KDE],[
-	AC_BASE_PATH_KDE
-	AC_ARG_ENABLE(path-check,
-		[  --disable-path-check    don't try to find out, where to install],
-		[
-			if test "$enableval" = "no"; then
-				ac_use_path_checking="default"
-			else
-				ac_use_path_checking=""
-			fi
-		], [ac_use_path_checking="default"]
-	)
-
-	AC_CREATE_KFSSTND($ac_use_path_checking)
-	save_BINDIR=$bindir
-	bindir=$kde_bindir
-	KDE_SUBST_PROGRAMS
-	bindir=$save_BINDIR
-	KDE_SUBST_PROGRAMS
-
-	AC_SUBST_KFSSTND
-	KDE_CREATE_LIBS_ALIASES
-])
diff --git a/conf/m4/kde/AC_PATH_QT.m4 b/conf/m4/kde/AC_PATH_QT.m4
deleted file mode 100644
index 863ed7e..0000000
--- a/conf/m4/kde/AC_PATH_QT.m4
+++ /dev/null
@@ -1,4 +0,0 @@
-AC_DEFUN([AC_PATH_QT],
-[
-AC_PATH_QT_ANY
-])
diff --git a/conf/m4/kde/AC_PATH_QT_1_3.m4 b/conf/m4/kde/AC_PATH_QT_1_3.m4
deleted file mode 100644
index bfce573..0000000
--- a/conf/m4/kde/AC_PATH_QT_1_3.m4
+++ /dev/null
@@ -1,179 +0,0 @@
-dnl ------------------------------------------------------------------------
-dnl Try to find the Qt headers and libraries.
-dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
-dnl ------------------------------------------------------------------------
-dnl
-dnl
-AC_DEFUN([AC_TRY_PATH_QT],[
-	AC_REQUIRE([K_PATH_X])
-	AC_REQUIRE([KDE_USE_QT])
-
-	LIBQT="-l$1"
-	if test $kde_qtver = 2; then
-		AC_REQUIRE([AC_FIND_PNG])
-		LIBQT="$LIBQT $LIBPNG"
-	fi
-
-	echo -n "($2) "
-
-	LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSOCKET"
-	ac_qt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO
-	qt_libraries=""
-	qt_includes=""
-	kde_qt_libs_given=no
-
-	AC_ARG_WITH(qt-dir,
-		[  --with-qt-dir=DIR       where the root of Qt is installed ],
-		[  ac_qt_includes="$withval"/include
-		   ac_qt_libraries="$withval"/lib
-		   ac_qt_bindir="$withval"/bin
-		]
-	)
-
-	AC_ARG_WITH(qt-includes,
-		[  --with-qt-includes=DIR  where the Qt includes are. ],
-		[ ac_qt_includes="$withval" ]
-	)
-
-
-	AC_ARG_WITH(qt-libraries,
-		[  --with-qt-libraries=DIR where the Qt library is installed.],
-		[  ac_qt_libraries="$withval"
-		   kde_qt_libs_given=yes
-		]
-	)
-
-	#try to guess Qt locations
-
-	qt_incdirs="$QTINC /usr/lib/qt/include /usr/local/qt/include /usr/include/qt /usr/include/qt3 /usr/include /usr/lib/qt3/include /usr/lib/qt2/include /usr/X11R6/include/X11/qt $x_includes"
-	test -n "$QTDIR" && qt_incdirs="$QTDIR/include $QTDIR $qt_incdirs"
-	qt_incdirs="$ac_qt_includes $qt_incdirs"
-
-	if test "$kde_qtver" = "2"; then
-		kde_qt_header=qstyle.h
-	else
-		kde_qt_header=qglobal.h
-	fi
-
-	AC_FIND_FILE($kde_qt_header, $qt_incdirs, qt_incdir)
-	ac_qt_includes="$qt_incdir"
-
-	qt_libdirs="$QTLIB /usr/lib/qt/lib /usr/X11R6/lib /usr/lib /usr/local/qt/lib /usr/lib/qt /usr/lib/qt3/lib /usr/lib/qt2/lib $x_libraries"
-	test -n "$QTDIR" && qt_libdirs="$QTDIR/lib $QTDIR $qt_libdirs"
-	if test ! "$ac_qt_libraries" = "NO"; then
-		qt_libdirs="$ac_qt_libraries $qt_libdirs"
-	fi
-
-	qt_libdir=NONE
-	for dir in $qt_libdirs; do
-		try="ls -1 $dir/lib$1.*so"
-		if eval $try >/dev/null 2>&1 ; then
-			qt_libdir=$dir;
-			break;
-		else
-			echo "tried $dir" >&AC_FD_CC
-		fi
-	done
-
-	ac_qt_libraries="$qt_libdir"
-
-	AC_LANG_SAVE
-	AC_LANG_CPLUSPLUS
-
-	ac_cxxflags_safe="$CXXFLAGS"
-	ac_ldflags_safe="$LDFLAGS"
-	ac_libs_safe="$LIBS"
-
-	CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
-	LDFLAGS="-L$qt_libdir $all_libraries"
-	LIBS="$LIBS $LIBQT"
-
-	KDE_PRINT_QT_PROGRAM
-
-	if AC_TRY_EVAL(ac_link) && test -s conftest; then
-		rm -f conftest*
-	else
-		echo "configure: failed program was:" >&AC_FD_CC
-		cat conftest.$ac_ext >&AC_FD_CC
-		ac_qt_libraries="NO"
-	fi
-	rm -f conftest*
-	CXXFLAGS="$ac_cxxflags_safe"
-	LDFLAGS="$ac_ldflags_safe"
-	LIBS="$ac_libs_safe"
-
-	AC_LANG_RESTORE
-
-	if test "$ac_qt_includes" = NO || test "$ac_qt_libraries" = NO; then
-		have_qt=no
-		ac_qt_notfound=""
-		if test "$ac_qt_includes" = NO; then
-			if test "$ac_qt_libraries" = NO; then
-				ac_qt_notfound="(headers and libraries)";
-			else
-				ac_qt_notfound="(headers)";
-			fi
-		else
-			ac_qt_notfound="(libraries)";
-		fi
-	else
-		have_qt="yes"
-	fi
-])
-
-
-AC_DEFUN([AC_PATH_QT_ANY],[
-
-	AC_MSG_CHECKING([for Qt])
-	AC_CACHE_VAL(ac_cv_have_qt,[
-		AC_TRY_PATH_QT(qt, single-threaded)
-		if test "$have_qt" != yes; then
-			AC_TRY_PATH_QT(qt-mt, multi-threaded)
-			if test "$have_qt" != yes; then
-				AC_MSG_ERROR([Qt ($kde_qt_minversion) $ac_qt_notfound not found. Please check your installation! ]);
-			fi
-		fi
-		ac_cv_have_qt="have_qt=$have_qt"
-	])
-
-	eval "$ac_cv_have_qt"
-	if test "$have_qt" != yes; then
-		AC_MSG_RESULT([$have_qt]);
-	else
-		ac_cv_have_qt="have_qt=yes \
-			ac_qt_includes=$ac_qt_includes ac_qt_libraries=$ac_qt_libraries"
-		AC_MSG_RESULT([libraries $ac_qt_libraries, headers $ac_qt_includes])
-
-		qt_libraries="$ac_qt_libraries"
-		qt_includes="$ac_qt_includes"
-	fi
-
-	if test ! "$kde_qt_libs_given" = "yes"; then
-		KDE_CHECK_QT_DIRECT(qt_libraries= ,[])
-	fi
-
-	AC_SUBST(qt_libraries)
-	AC_SUBST(qt_includes)
-
-	if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
-		QT_INCLUDES="";
-	else
-		QT_INCLUDES="-I$qt_includes"
-		all_includes="$QT_INCLUDES $all_includes"
-	fi
-
-	if test "$qt_libraries" = "$x_libraries" || test "$qt_libraries" = "/usr/lib" || test -z "$qt_libraries"; then
-		QT_LDFLAGS=""
-	else
-		QT_LDFLAGS="-L$qt_libraries"
-		all_libraries="$QT_LDFLAGS $all_libraries"
-	fi
-
-	AC_SUBST(QT_INCLUDES)
-	AC_SUBST(QT_LDFLAGS)
-	AC_PATH_QT_MOC
-
-	LIB_QT='$(LIBQT) $(LIBPNG) -lXext $(LIB_X11) $(X_PRE_LIBS)'
-	AC_SUBST(LIB_QT)
-])
diff --git a/conf/m4/kde/AC_PATH_QT_MOC.m4 b/conf/m4/kde/AC_PATH_QT_MOC.m4
deleted file mode 100644
index 4d9da90..0000000
--- a/conf/m4/kde/AC_PATH_QT_MOC.m4
+++ /dev/null
@@ -1,34 +0,0 @@
-dnl ------------------------------------------------------------------------
-dnl Find the meta object compiler in the PATH, in $QTDIR/bin, and some
-dnl more usual places
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([KDE_MOC_ERROR_MESSAGE],
-[
-	AC_MSG_ERROR([Could not find meta object compiler (moc)])
-])
-
-AC_DEFUN([AC_PATH_QT_MOC],
-[
-   KDE_FIND_PATH(moc, MOC, [$ac_qt_bindir $QTDIR/bin $QTDIR/src/moc \
-	    /usr/bin /usr/X11R6/bin /usr/lib/qt/bin /usr/lib/qt2/bin \
-	    /usr/lib/qt3/bin /usr/local/qt/bin], [KDE_MOC_ERROR_MESSAGE])
-
-   if test -z "$MOC"; then
-     if test -n "$ac_cv_path_moc"; then
-       eval "$ac_cv_path_moc --help 2>&1 | sed -e '1q' | grep Qt" > cfout.$$
-     fi
-     echo "configure:__oline__: tried to call $ac_cv_path_moc --help 2>&1 | sed -e '1q' | grep Qt" >&AC_FD_CC
-     echo "configure:__oline__: moc output:" >&AC_FD_CC
-     cat cfout.$$ >&AC_FD_CC
-
-     if test -s cfout.$$; then
-       rm -f cfout.$$
-     else
-       KDE_MOC_ERROR_MESSAGE
-    fi
-    rm -f cfout.$$
-   fi
-
-   AC_SUBST(MOC)
-])
diff --git a/conf/m4/kde/AC_SUBST_KFSSTND.m4 b/conf/m4/kde/AC_SUBST_KFSSTND.m4
deleted file mode 100644
index d19a018..0000000
--- a/conf/m4/kde/AC_SUBST_KFSSTND.m4
+++ /dev/null
@@ -1,18 +0,0 @@
-AC_DEFUN([AC_SUBST_KFSSTND],
-[
-AC_SUBST(kde_htmldir)
-AC_SUBST(kde_appsdir)
-AC_SUBST(kde_icondir)
-AC_SUBST(kde_sounddir)
-AC_SUBST(kde_datadir)
-AC_SUBST(kde_locale)
-AC_SUBST(kde_cgidir)
-AC_SUBST(kde_confdir)
-AC_SUBST(kde_mimedir)
-AC_SUBST(kde_toolbardir)
-AC_SUBST(kde_wallpaperdir)
-AC_SUBST(kde_bindir)
-AC_SUBST(kde_servicesdir)
-AC_SUBST(kde_servicetypesdir)
-AC_SUBST(kde_moduledir)
-])
diff --git a/conf/m4/kde/AM_KDE_GNU_GETTEXT.m4 b/conf/m4/kde/AM_KDE_GNU_GETTEXT.m4
deleted file mode 100644
index ea53487..0000000
--- a/conf/m4/kde/AM_KDE_GNU_GETTEXT.m4
+++ /dev/null
@@ -1,69 +0,0 @@
-# Macro to add for using GNU gettext.
-# Ulrich Drepper <drepper@cygnus.com>, 1995.
-
-# serial 1
-# Stephan Kulow: I put a KDE in it to avoid name conflicts
-
-AC_DEFUN([AM_KDE_GNU_GETTEXT],
-  [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-   AC_REQUIRE([AC_PROG_RANLIB])dnl
-   AC_REQUIRE([AC_HEADER_STDC])dnl
-   AC_REQUIRE([AC_C_INLINE])dnl
-   AC_REQUIRE([AC_TYPE_OFF_T])dnl
-   AC_REQUIRE([AC_TYPE_SIZE_T])dnl
-   AC_REQUIRE([AC_FUNC_ALLOCA])dnl
-   AC_REQUIRE([AC_FUNC_MMAP])dnl
-   AC_REQUIRE([AM_KDE_WITH_NLS])dnl
-   AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \
-unistd.h values.h alloca.h])
-   AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
-__argz_count __argz_stringify __argz_next])
-
-   AC_MSG_CHECKING(for stpcpy)
-   AC_CACHE_VAL(kde_cv_func_stpcpy,
-   [
-   kde_safe_cxxflags=$CXXFLAGS
-   CXXFLAGS="-Wmissing-prototypes -Werror"
-   AC_LANG_SAVE
-   AC_LANG_CPLUSPLUS
-   AC_TRY_COMPILE([
-   #include <string.h>
-   ],
-   [
-   char buffer[200];
-   stpcpy(buffer, buffer);
-   ],
-   kde_cv_func_stpcpy=yes,
-   kde_cv_func_stpcpy=no)
-   AC_LANG_RESTORE
-   CXXFLAGS=$kde_safe_cxxflags
-   ])
-   AC_MSG_RESULT($kde_cv_func_stpcpy)
-   if eval "test \"`echo $kde_cv_func_stpcpy`\" = yes"; then
-     AC_DEFINE(HAVE_STPCPY, 1, [Define if you have stpcpy])
-   fi
-
-   AM_LC_MESSAGES
-
-   if test "x$CATOBJEXT" != "x"; then
-     if test "x$ALL_LINGUAS" = "x"; then
-       LINGUAS=
-     else
-       AC_MSG_CHECKING(for catalogs to be installed)
-       NEW_LINGUAS=
-       for lang in ${LINGUAS=$ALL_LINGUAS}; do
-         case "$ALL_LINGUAS" in
-          *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
-         esac
-       done
-       LINGUAS=$NEW_LINGUAS
-       AC_MSG_RESULT($LINGUAS)
-     fi
-
-     dnl Construct list of names of catalog files to be constructed.
-     if test -n "$LINGUAS"; then
-       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
-     fi
-   fi
-
-  ])
diff --git a/conf/m4/kde/AM_KDE_WITH_NLS.m4 b/conf/m4/kde/AM_KDE_WITH_NLS.m4
deleted file mode 100644
index f84076c..0000000
--- a/conf/m4/kde/AM_KDE_WITH_NLS.m4
+++ /dev/null
@@ -1,60 +0,0 @@
-dnl This is a merge of some macros out of the gettext aclocal.m4
-dnl since we don't need anything, I took the things we need
-dnl the copyright for them is:
-dnl >
-dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-dnl This Makefile.in is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-dnl >
-dnl for this file it is relicensed under LGPL
-
-AC_DEFUN([AM_KDE_WITH_NLS],
-  [AC_MSG_CHECKING([whether NLS is requested])
-    dnl Default is enabled NLS
-    AC_ARG_ENABLE(nls,
-      [  --disable-nls           do not use Native Language Support],
-      USE_NLS=$enableval, USE_NLS=yes)
-    AC_MSG_RESULT($USE_NLS)
-    AC_SUBST(USE_NLS)
-
-    dnl If we use NLS figure out what method
-    if test "$USE_NLS" = "yes"; then
-      AC_DEFINE(ENABLE_NLS, 1, [Define if NLS is requested])
-
-      AM_PATH_PROG_WITH_TEST_KDE(MSGFMT, msgfmt,
-         [test -n "`$ac_dir/$ac_word --version 2>&1 | grep 'GNU gettext'`"], msgfmt)
-      AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-
-      if test -z "`$GMSGFMT --version 2>&1 | grep 'GNU gettext'`"; then
-        AC_MSG_RESULT([found msgfmt program is not GNU msgfmt; ignore it])
-        GMSGFMT=":"
-      fi
-      MSGFMT=$GMSGFMT
-      AC_SUBST(GMSGFMT)
-      AC_SUBST(MSGFMT)
-
-      AM_PATH_PROG_WITH_TEST_KDE(XGETTEXT, xgettext,
-	[test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-
-      dnl Test whether we really found GNU xgettext.
-      if test "$XGETTEXT" != ":"; then
-	dnl If it is no GNU xgettext we define it as : so that the
-	dnl Makefiles still can work.
-	if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
-	  : ;
-	else
-	  AC_MSG_RESULT(
-	    [found xgettext programs is not GNU xgettext; ignore it])
-	  XGETTEXT=":"
-	fi
-      fi
-     AC_SUBST(XGETTEXT)
-    fi
-
-  ])
diff --git a/conf/m4/kde/AM_PATH_PROG_WITH_TEST_KDE.m4 b/conf/m4/kde/AM_PATH_PROG_WITH_TEST_KDE.m4
deleted file mode 100644
index de1cba8..0000000
--- a/conf/m4/kde/AM_PATH_PROG_WITH_TEST_KDE.m4
+++ /dev/null
@@ -1,43 +0,0 @@
-# Search path for a program which passes the given test.
-# Ulrich Drepper <drepper@cygnus.com>, 1996.
-
-# serial 1
-# Stephan Kulow: I appended a _KDE against name conflicts
-
-dnl AM_PATH_PROG_WITH_TEST_KDE(VARIABLE, PROG-TO-CHECK-FOR,
-dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-AC_DEFUN([AM_PATH_PROG_WITH_TEST_KDE],
-[# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=[$]2
-AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL(ac_cv_path_$1,
-[case "[$]$1" in
-  /*)
-  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in ifelse([$5], , $PATH, [$5]); do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if [$3]; then
-	ac_cv_path_$1="$ac_dir/$ac_word"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-dnl If no 4th arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-])dnl
-  ;;
-esac])dnl
-$1="$ac_cv_path_$1"
-if test -n "[$]$1"; then
-  AC_MSG_RESULT([$]$1)
-else
-  AC_MSG_RESULT(no)
-fi
-AC_SUBST($1)dnl
-])
diff --git a/conf/m4/kde/KDE_CHECK_EXTRA_LIBS.m4 b/conf/m4/kde/KDE_CHECK_EXTRA_LIBS.m4
deleted file mode 100644
index f1edb66..0000000
--- a/conf/m4/kde/KDE_CHECK_EXTRA_LIBS.m4
+++ /dev/null
@@ -1,56 +0,0 @@
-AC_DEFUN([KDE_CHECK_EXTRA_LIBS],
-[
-AC_MSG_CHECKING(for extra includes)
-AC_ARG_WITH(extra-includes, [  --with-extra-includes=DIR
-                          adds non standard include paths],
-  kde_use_extra_includes="$withval",
-  kde_use_extra_includes=NONE
-)
-kde_extra_includes=
-if test -n "$kde_use_extra_includes" && \
-   test "$kde_use_extra_includes" != "NONE"; then
-
-   ac_save_ifs=$IFS
-   IFS=':'
-   for dir in $kde_use_extra_includes; do
-     kde_extra_includes="$kde_extra_includes $dir"
-     all_includes="$all_includes -I$dir"
-     USER_INCLUDES="$USER_INCLUDES -I$dir"
-   done
-   IFS=$ac_save_ifs
-   kde_use_extra_includes="added"
-else
-   kde_use_extra_includes="no"
-fi
-AC_SUBST(USER_INCLUDES)
-
-AC_MSG_RESULT($kde_use_extra_includes)
-
-kde_extra_libs=
-AC_MSG_CHECKING(for extra libs)
-AC_ARG_WITH(extra-libs, [  --with-extra-libs=DIR   adds non standard library paths],
-  kde_use_extra_libs=$withval,
-  kde_use_extra_libs=NONE
-)
-if test -n "$kde_use_extra_libs" && \
-   test "$kde_use_extra_libs" != "NONE"; then
-
-   ac_save_ifs=$IFS
-   IFS=':'
-   for dir in $kde_use_extra_libs; do
-     kde_extra_libs="$kde_extra_libs $dir"
-     all_libraries="$all_libraries -L$dir"
-     KDE_EXTRA_RPATH="$KDE_EXTRA_RPATH -R $dir"
-     USER_LDFLAGS="$USER_LDFLAGS -L$dir"
-   done
-   IFS=$ac_save_ifs
-   kde_use_extra_libs="added"
-else
-   kde_use_extra_libs="no"
-fi
-
-AC_SUBST(USER_LDFLAGS)
-
-AC_MSG_RESULT($kde_use_extra_libs)
-
-])
diff --git a/conf/m4/kde/KDE_CHECK_FINAL.m4 b/conf/m4/kde/KDE_CHECK_FINAL.m4
deleted file mode 100644
index f7ff656..0000000
--- a/conf/m4/kde/KDE_CHECK_FINAL.m4
+++ /dev/null
@@ -1,30 +0,0 @@
-AC_DEFUN([KDE_CHECK_FINAL],
-[
-  AC_ARG_ENABLE(final, [  --enable-final          build size optimized apps (needs lots of memory)],
-	kde_use_final=yes, kde_use_final=no, kde_use_final=no)
-
-  if test "x$kde_use_final" = "xyes"; then
-      KDE_USE_FINAL_TRUE=""
-      KDE_USE_FINAL_FALSE="#"
-      KDE_CHECK_REPO
-   else
-      KDE_USE_FINAL_TRUE="#"
-      KDE_USE_FINAL_FALSE=""
-  fi
-  AC_SUBST(KDE_USE_FINAL_TRUE)
-  AC_SUBST(KDE_USE_FINAL_FALSE)
-
-  AC_ARG_ENABLE(closure, [  --disable-closure       don't delay template instantiation],
-  	kde_use_closure=$enableval, kde_use_closure=yes)
-
-  if test "x$kde_use_closure" = "xyes"; then
-       KDE_USE_CLOSURE_TRUE=""
-       KDE_USE_CLOSURE_FALSE="#"
-#       CXXFLAGS="$CXXFLAGS $REPO"
-  else
-       KDE_USE_CLOSURE_TRUE="#"
-       KDE_USE_CLOSURE_FALSE=""
-  fi
-  AC_SUBST(KDE_USE_CLOSURE_TRUE)
-  AC_SUBST(KDE_USE_CLOSURE_FALSE)
-])
diff --git a/conf/m4/kde/KDE_CHECK_LIBDL.m4 b/conf/m4/kde/KDE_CHECK_LIBDL.m4
deleted file mode 100644
index 8350752..0000000
--- a/conf/m4/kde/KDE_CHECK_LIBDL.m4
+++ /dev/null
@@ -1,14 +0,0 @@
-AC_DEFUN([KDE_CHECK_LIBDL],
-[
-AC_CHECK_LIB(dl, dlopen, [
-LIBDL="-ldl"
-ac_cv_have_dlfcn=yes
-])
-
-AC_CHECK_LIB(dld, shl_unload, [
-LIBDL="-ldld"
-ac_cv_have_shload=yes
-])
-
-AC_SUBST(LIBDL)
-])
diff --git a/conf/m4/kde/KDE_CHECK_QT_DIRECT.m4 b/conf/m4/kde/KDE_CHECK_QT_DIRECT.m4
deleted file mode 100644
index 3559279..0000000
--- a/conf/m4/kde/KDE_CHECK_QT_DIRECT.m4
+++ /dev/null
@@ -1,52 +0,0 @@
-AC_DEFUN([KDE_CHECK_QT_DIRECT],
-[
-AC_REQUIRE([KDE_USE_QT])
-AC_MSG_CHECKING([if Qt compiles without flags])
-AC_CACHE_VAL(kde_cv_qt_direct,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-ac_LD_LIBRARY_PATH_safe=$LD_LIBRARY_PATH
-ac_LIBRARY_PATH="$LIBRARY_PATH"
-ac_cxxflags_safe="$CXXFLAGS"
-ac_ldflags_safe="$LDFLAGS"
-ac_libs_safe="$LIBS"
-
-CXXFLAGS="$CXXFLAGS -I$qt_includes"
-LDFLAGS="$X_LDFLAGS"
-LIBS="-lqt -lXext -lX11 $LIBSOCKET"
-LD_LIBRARY_PATH=
-export LD_LIBRARY_PATH
-LIBRARY_PATH=
-export LIBRARY_PATH
-
-KDE_PRINT_QT_PROGRAM
-
-if AC_TRY_EVAL(ac_link) && test -s conftest; then
-  kde_cv_qt_direct="yes"
-else
-  kde_cv_qt_direct="no"
-  echo "configure: failed program was:" >&AC_FD_CC
-  cat conftest.$ac_ext >&AC_FD_CC
-fi
-
-rm -f conftest*
-CXXFLAGS="$ac_cxxflags_safe"
-LDFLAGS="$ac_ldflags_safe"
-LIBS="$ac_libs_safe"
-
-LD_LIBRARY_PATH="$ac_LD_LIBRARY_PATH_safe"
-export LD_LIBRARY_PATH
-LIBRARY_PATH="$ac_LIBRARY_PATH"
-export LIBRARY_PATH
-AC_LANG_RESTORE
-])
-
-if test "$kde_cv_qt_direct" = "yes"; then
-  AC_MSG_RESULT(yes)
-  $1
-else
-  AC_MSG_RESULT(no)
-  $2
-fi
-])
diff --git a/conf/m4/kde/KDE_CREATE_LIBS_ALIASES.m4 b/conf/m4/kde/KDE_CREATE_LIBS_ALIASES.m4
deleted file mode 100644
index 9c9652b..0000000
--- a/conf/m4/kde/KDE_CREATE_LIBS_ALIASES.m4
+++ /dev/null
@@ -1,52 +0,0 @@
-AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
-[
-   AC_REQUIRE([KDE_MISC_TESTS])
-   AC_REQUIRE([KDE_CHECK_LIBDL])
-   AC_REQUIRE([K_PATH_X])
-   AC_REQUIRE([KDE_VERSION])
-
-
-if test $kde_qtver = 2; then
-   LIB_KDECORE='-lkdecore'
-   AC_SUBST(LIB_KDECORE)
-   LIB_KDEUI='-lkdeui'
-   AC_SUBST(LIB_KDEUI)
-   LIB_KFORMULA='-lformula'
-   AC_SUBST(LIB_KFORMULA)
-   LIB_KIO='-lkio'
-   AC_SUBST(LIB_KIO)
-   LIB_SMB='-lsmb'
-   AC_SUBST(LIB_SMB)
-   if test $ac_kde_version = 2; then
-   	LIB_KFILE='-lkfile'
-   else
-   	LIB_KFILE=
-   fi
-   AC_SUBST(LIB_KFILE)
-   LIB_KAB='-lkab'
-   AC_SUBST(LIB_KAB)
-   LIB_MEDIATOOL='-lmediatool'
-   AC_SUBST(LIB_MEDIATOOL)
-   LIB_KHTML='-lkhtml'
-   AC_SUBST(LIB_KHTML)
-   LIB_KSPELL='-lkspell'
-   AC_SUBST(LIB_KSPELL)
-else
-   LIB_KDECORE='-lkdecore -lXext $(LIB_QT)'
-   AC_SUBST(LIB_KDECORE)
-   LIB_KDEUI='-lkdeui $(LIB_KDECORE)'
-   AC_SUBST(LIB_KDEUI)
-   LIB_KFM='-lkfm $(LIB_KDECORE)'
-   AC_SUBST(LIB_KFM)
-   if test $ac_kde_version = 2; then
-   	LIB_KFILE='-lkfile $(LIB_KFM) $(LIB_KDEUI)'
-   else
-   	LIB_KFILE='$(LIB_KFM) $(LIB_KDEUI)'
-   fi
-   AC_SUBST(LIB_KFILE)
-   LIB_KAB='-lkab $(LIB_KIMGIO) $(LIB_KDECORE)'
-   AC_SUBST(LIB_KAB)
-   LIB_MEDIATOOL='-lmediatool $(LIB_KDECORE)'
-   AC_SUBST(LIB_MEDIATOOL)
-fi
-])
diff --git a/conf/m4/kde/KDE_FIND_PATH.m4 b/conf/m4/kde/KDE_FIND_PATH.m4
deleted file mode 100644
index 08e14fe..0000000
--- a/conf/m4/kde/KDE_FIND_PATH.m4
+++ /dev/null
@@ -1,53 +0,0 @@
-dnl KDE_FIND_PATH(programm-name, variable-name, list of directories,
-dnl	if-not-found, test-parameter)
-AC_DEFUN([KDE_FIND_PATH],
-[
-   AC_MSG_CHECKING([for $1])
-   kde_cache=`echo $1 | sed 'y%./+-%__p_%'`
-
-   AC_CACHE_VAL(kde_cv_path_$kde_cache,
-   [
-     kde_cv_path="NONE"
-     if test -n "$$2"; then
-        kde_cv_path="$$2";
-     else
-	dirs="$3"
-	kde_save_IFS=$IFS
-	IFS=':'
-	for dir in $PATH; do
-	  dirs="$dirs $dir"
-        done
-	IFS=$kde_save_IFS
-
-        for dir in $dirs; do
-	  if test -x "$dir/$1"; then
-	    if test -n "$5"
-	    then
-              evalstr="$dir/$1 $5 2>&1 "
-	      if eval $evalstr; then
-                kde_cv_path="$dir/$1"
-                break
-	      fi
-            else
-		kde_cv_path="$dir/$1"
-                break
-	    fi
-          fi
-	done
-
-     fi
-
-     eval "kde_cv_path_$kde_cache=$kde_cv_path"
-
-   ])
-
-   eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      AC_MSG_RESULT(not found)
-      $4
-   else
-      AC_MSG_RESULT($kde_cv_path)
-      $2=$kde_cv_path
-
-   fi
-])
diff --git a/conf/m4/kde/KDE_MISC_TESTS.m4 b/conf/m4/kde/KDE_MISC_TESTS.m4
deleted file mode 100644
index 922667b..0000000
--- a/conf/m4/kde/KDE_MISC_TESTS.m4
+++ /dev/null
@@ -1,63 +0,0 @@
-AC_DEFUN([KDE_MISC_TESTS],
-[
-   AC_LANG_C
-   dnl Checks for libraries.
-   AC_CHECK_LIB(compat, main, [LIBCOMPAT="-lcompat"]) dnl for FreeBSD
-   AC_SUBST(LIBCOMPAT)
-   kde_have_crypt=
-   AC_CHECK_LIB(crypt, crypt, [LIBCRYPT="-lcrypt"; kde_have_crypt=yes],
-      AC_CHECK_LIB(c, crypt, [kde_have_crypt=yes], [
-        AC_MSG_WARN([you have no crypt in either libcrypt or libc.
-You should install libcrypt from another source or configure with PAM
-support])
-	kde_have_crypt=no
-      ]))
-   AC_SUBST(LIBCRYPT)
-   if test $kde_have_crypt = yes; then
-      AC_DEFINE_UNQUOTED(HAVE_CRYPT, 1, [Defines if your system has the crypt function])
-   fi
-   AC_CHECK_KSIZE_T
-   AC_LANG_C
-   AC_CHECK_LIB(dnet, dnet_ntoa, [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"])
-   if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-      AC_CHECK_LIB(dnet_stub, dnet_ntoa,
-        [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"])
-   fi
-   AC_CHECK_FUNC(inet_ntoa)
-   if test $ac_cv_func_inet_ntoa = no; then
-     AC_CHECK_LIB(nsl, inet_ntoa, X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl")
-   fi
-   AC_CHECK_FUNC(connect)
-   if test $ac_cv_func_connect = no; then
-      AC_CHECK_LIB(socket, connect, X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS", ,
-        $X_EXTRA_LIBS)
-   fi
-
-   AC_CHECK_FUNC(remove)
-   if test $ac_cv_func_remove = no; then
-      AC_CHECK_LIB(posix, remove, X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix")
-   fi
-
-   # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-   AC_CHECK_FUNC(shmat)
-   if test $ac_cv_func_shmat = no; then
-     AC_CHECK_LIB(ipc, shmat, X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc")
-   fi
-
-   LIBSOCKET="$X_EXTRA_LIBS"
-   AC_SUBST(LIBSOCKET)
-   AC_SUBST(X_EXTRA_LIBS)
-   AC_CHECK_LIB(ucb, killpg, [LIBUCB="-lucb"]) dnl for Solaris2.4
-   AC_SUBST(LIBUCB)
-
-   case $host in  dnl this *is* LynxOS specific
-   *-*-lynxos* )
-        AC_MSG_CHECKING([LynxOS header file wrappers])
-        [CFLAGS="$CFLAGS -D__NO_INCLUDE_WARN__"]
-        AC_MSG_RESULT(disabled)
-        AC_CHECK_LIB(bsd, gethostbyname, [LIBSOCKET="-lbsd"]) dnl for LynxOS
-         ;;
-    esac
-
-   AC_REQUIRE([KDE_CHECK_LIBDL])
-])
diff --git a/conf/m4/kde/KDE_MISSING_PROG_ERROR.m4 b/conf/m4/kde/KDE_MISSING_PROG_ERROR.m4
deleted file mode 100644
index b2a2f9f..0000000
--- a/conf/m4/kde/KDE_MISSING_PROG_ERROR.m4
+++ /dev/null
@@ -1,6 +0,0 @@
-AC_DEFUN([KDE_MISSING_PROG_ERROR],
-[
-    AC_MSG_ERROR([The important program $1 was not found!
-Please check whether you installed KDE correctly.
-])
-])
diff --git a/conf/m4/kde/KDE_PRINT_QT_PROGRAM.m4 b/conf/m4/kde/KDE_PRINT_QT_PROGRAM.m4
deleted file mode 100644
index 8bbd3df..0000000
--- a/conf/m4/kde/KDE_PRINT_QT_PROGRAM.m4
+++ /dev/null
@@ -1,33 +0,0 @@
-AC_DEFUN([KDE_PRINT_QT_PROGRAM],[
-	AC_REQUIRE([KDE_USE_QT])
-	cat > conftest.$ac_ext <<-EOF
-		#include "confdefs.h"
-		#include <qglobal.h>
-		#include <qapplication.h>
-	EOF
-	if test "$kde_qtver" = "2"; then
-		cat >> conftest.$ac_ext <<-EOF
-			#include <qstyle.h>
-			#include <qiconview.h>
-		EOF
-	fi
-
-	echo "#if ! ($kde_qt_verstring)" >> conftest.$ac_ext
-	cat >> conftest.$ac_ext <<-EOF
-		#error 1
-		#endif
-
-		int main() {
-	EOF
-	if test "$kde_qtver" = "2"; then
-		cat >> conftest.$ac_ext <<-EOF
-			QStringList *t = new QStringList();
-			QIconView iv(0);
-			iv.setWordWrapIconText(false);
-		EOF
-	fi
-	cat >> conftest.$ac_ext <<-EOF
-		return 0;
-		}
-	EOF
-])
diff --git a/conf/m4/kde/KDE_SUBST_PROGRAMS.m4 b/conf/m4/kde/KDE_SUBST_PROGRAMS.m4
deleted file mode 100644
index 300e176..0000000
--- a/conf/m4/kde/KDE_SUBST_PROGRAMS.m4
+++ /dev/null
@@ -1,44 +0,0 @@
-AC_DEFUN([KDE_SUBST_PROGRAMS],
-[AC_REQUIRE([AC_CREATE_KFSSTND])dnl
-
-        kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde2/bin /usr/kde/bin /usr/local/kde/bin"
-        if test -n "$KDEDIRS"; then
-           kde_save_IFS=$IFS
-           IFS=:
-           for dir in $KDEDIRS; do
-                kde_default_bindirs="$dir/bin $kde_default_bindirs "
-           done
-           IFS=$kde_save_IFS
-        fi
-        kde_default_bindirs="$kde_exec_prefix/bin $kde_prefix/bin $kde_default_bindirs"
-        KDE_FIND_PATH(dcopidl, DCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl)])
-        KDE_FIND_PATH(dcopidl2cpp, DCOPIDL2CPP, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl2cpp)])
-        KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(mcopidl)])
-        KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(artsc-config)])
-        KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)])
-
-        DCOP_DEPENDENCIES='$(DCOPIDL)'
-        AC_SUBST(DCOPIDL)
-        AC_SUBST(DCOPIDL2CPP)
-        AC_SUBST(DCOP_DEPENDENCIES)
-        AC_SUBST(MCOPIDL)
-        AC_SUBST(ARTSCCONFIG)
-        AC_SUBST(KDECONFIG)
-
-        if test -x "$KDECONFIG"; then # it can be "compiled"
-          kde_libs_prefix=`$KDECONFIG --prefix`
-          if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
-               AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs.
-                          This means it has been moved since you installed it.
-                          This won't work. Please recompile kdelibs for the new prefix.
-                          ])
-           fi
-           kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
-        else
-           kde_libs_prefix='$(kde_prefix)'
-           kde_libs_htmldir='$(kde_htmldir)'
-        fi
-        AC_SUBST(kde_libs_prefix)
-        AC_SUBST(kde_libs_htmldir)
-])dnl
-
diff --git a/conf/m4/kde/KDE_USE_QT.m4 b/conf/m4/kde/KDE_USE_QT.m4
deleted file mode 100644
index 142eb32..0000000
--- a/conf/m4/kde/KDE_USE_QT.m4
+++ /dev/null
@@ -1,28 +0,0 @@
-AC_DEFUN([KDE_USE_QT],
-[
-if test -z "$1"; then
-  kde_qtver=2
-else
-  kde_qtver=$1
-fi
-
-if test -z "$2"; then
-  if test $kde_qtver = 2; then
-    kde_qt_minversion=">= 19991109"
-   else
-    kde_qt_minversion=">= 1.42 and < 2.0"
-  fi
-else
-   kde_qt_minversion=$2
-fi
-
-if test -z "$3"; then
-    if test $kde_qtver = 2; then
-    kde_qt_verstring="QT_VERSION >= 200"
-   else
-    kde_qt_verstring="QT_VERSION >= 142 && QT_VERSION < 200"
-  fi
-else
-   kde_qt_verstring=$3
-fi
-])
diff --git a/conf/m4/kde/KDE_VERSION.m4 b/conf/m4/kde/KDE_VERSION.m4
deleted file mode 100644
index 9ae9026..0000000
--- a/conf/m4/kde/KDE_VERSION.m4
+++ /dev/null
@@ -1,17 +0,0 @@
-dnl
-dnl Check KDE version
-dnl
-AC_DEFUN([KDE_VERSION],
-[
-	ac_kde_version=2
-	AC_MSG_CHECKING(for KDE version)
-	tmp=`kde-config -v 2>/dev/null | grep KDE:`
-	case "$tmp" in
-		KDE:?3.*)
-			ac_kde_version=3
-			;;
-	esac
-	AC_MSG_RESULT($ac_kde_version.x)
-	kdeversion=$ac_kde_version
-	AC_SUBST(kdeversion)
-])
diff --git a/conf/m4/kde/K_PATH_X.m4 b/conf/m4/kde/K_PATH_X.m4
deleted file mode 100644
index d497942..0000000
--- a/conf/m4/kde/K_PATH_X.m4
+++ /dev/null
@@ -1,256 +0,0 @@
-# KDE_PATH_X_DIRECT
-dnl Internal subroutine of AC_PATH_X.
-dnl Set ac_x_includes and/or ac_x_libraries.
-AC_DEFUN([KDE_PATH_X_DIRECT],
-[if test "$ac_x_includes" = NO; then
-  # Guess where to find include files, by looking for this one X11 .h file.
-  test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
-
-  # First, try using that file with no special directory specified.
-AC_TRY_CPP([#include <$x_direct_test_include>],
-[# We can compile using X headers with no special include directory.
-ac_x_includes=],
-[# Look for the header file in a standard set of common directories.
-# Check X11 before X11Rn because it is often a symlink to the current release.
-  for ac_dir in               \
-    /usr/X11/include          \
-    /usr/X11R6/include        \
-    /usr/X11R5/include        \
-    /usr/X11R4/include        \
-                              \
-    /usr/include/X11          \
-    /usr/include/X11R6        \
-    /usr/include/X11R5        \
-    /usr/include/X11R4        \
-                              \
-    /usr/local/X11/include    \
-    /usr/local/X11R6/include  \
-    /usr/local/X11R5/include  \
-    /usr/local/X11R4/include  \
-                              \
-    /usr/local/include/X11    \
-    /usr/local/include/X11R6  \
-    /usr/local/include/X11R5  \
-    /usr/local/include/X11R4  \
-                              \
-    /usr/X386/include         \
-    /usr/x386/include         \
-    /usr/XFree86/include/X11  \
-                              \
-    /usr/include              \
-    /usr/local/include        \
-    /usr/unsupported/include  \
-    /usr/athena/include       \
-    /usr/local/x11r5/include  \
-    /usr/lpp/Xamples/include  \
-                              \
-    /usr/openwin/include      \
-    /usr/openwin/share/include \
-    ; \
-  do
-    if test -r "$ac_dir/$x_direct_test_include"; then
-      ac_x_includes=$ac_dir
-      break
-    fi
-  done])
-fi # $ac_x_includes = NO
-
-if test "$ac_x_libraries" = NO; then
-  # Check for the libraries.
-
-  test -z "$x_direct_test_library" && x_direct_test_library=Xt
-  test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc
-
-  # See if we find them without any special options.
-  # Don't add to $LIBS permanently.
-  ac_save_LIBS="$LIBS"
-  LIBS="-l$x_direct_test_library $LIBS"
-AC_TRY_LINK(, [${x_direct_test_function}()],
-[LIBS="$ac_save_LIBS"
-# We can link X programs with no special library path.
-ac_x_libraries=],
-[LIBS="$ac_save_LIBS"
-# First see if replacing the include by lib works.
-# Check X11 before X11Rn because it is often a symlink to the current release.
-for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \
-    /usr/X11/lib          \
-    /usr/X11R6/lib        \
-    /usr/X11R5/lib        \
-    /usr/X11R4/lib        \
-                          \
-    /usr/lib/X11          \
-    /usr/lib/X11R6        \
-    /usr/lib/X11R5        \
-    /usr/lib/X11R4        \
-                          \
-    /usr/local/X11/lib    \
-    /usr/local/X11R6/lib  \
-    /usr/local/X11R5/lib  \
-    /usr/local/X11R4/lib  \
-                          \
-    /usr/local/lib/X11    \
-    /usr/local/lib/X11R6  \
-    /usr/local/lib/X11R5  \
-    /usr/local/lib/X11R4  \
-                          \
-    /usr/X386/lib         \
-    /usr/x386/lib         \
-    /usr/XFree86/lib/X11  \
-                          \
-    /usr/lib              \
-    /usr/local/lib        \
-    /usr/unsupported/lib  \
-    /usr/athena/lib       \
-    /usr/local/x11r5/lib  \
-    /usr/lpp/Xamples/lib  \
-    /lib/usr/lib/X11	  \
-                          \
-    /usr/openwin/lib      \
-    /usr/openwin/share/lib \
-    ; \
-do
-dnl Don't even attempt the hair of trying to link an X program!
-  for ac_extension in a so sl; do
-    if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
-      ac_x_libraries=$ac_dir
-      break 2
-    fi
-  done
-done])
-fi # $ac_x_libraries = NO
-])
-
-dnl ------------------------------------------------------------------------
-dnl Find the header files and libraries for X-Windows. Extended the
-dnl macro AC_PATH_X
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([K_PATH_X],[
-	AC_REQUIRE([AC_PROG_CPP])
-	AC_MSG_CHECKING(for X)
-	AC_LANG_SAVE
-	AC_LANG_C
-	AC_CACHE_VAL(ac_cv_have_x,[
-		# One or both of the vars are not set, and there is no
-		# cached value.
-		if test "{$x_includes+set}" = set || test "$x_includes" = NONE; then
-			kde_x_includes=NO
-		else
-			kde_x_includes=$x_includes
-		fi
-		if test "{$x_libraries+set}" = set || test "$x_libraries" = NONE; then
-			kde_x_libraries=NO
-		else
-			kde_x_libraries=$x_libraries
-		fi
-
-		# below we use the standard autoconf calls
-		ac_x_libraries=$kde_x_libraries
-		ac_x_includes=$kde_x_includes
-
-		KDE_PATH_X_DIRECT
-		if test -z "$ac_x_includes"; then
-			ac_x_includes="."
-		fi
-		if test -z "$ac_x_libraries"; then
-			ac_x_libraries="/usr/lib"
-		fi
-		#from now on we use our own again
-
-		# when the user already gave --x-includes, we ignore
-		# what the standard autoconf macros told us.
-		if test "$kde_x_includes" = NO; then
-			kde_x_includes=$ac_x_includes
-		fi
-
-		if test "$kde_x_includes" = NO; then
-			AC_MSG_ERROR([Can't find X includes. Please check your installation and add the correct paths!])
-		fi
-
-		if test "$ac_x_libraries" = NO; then
-			AC_MSG_ERROR([Can't find X libraries. Please check your installation and add the correct paths!])
-		fi
-
-		# Record where we found X for the cache.
-		ac_cv_have_x="have_x=yes \
-			kde_x_includes=$kde_x_includes ac_x_libraries=$ac_x_libraries"
-	])dnl
-	eval "$ac_cv_have_x"
-
-	if test "$have_x" != yes; then
-		AC_MSG_RESULT($have_x)
-		no_x=yes
-	else
-		AC_MSG_RESULT([libraries $ac_x_libraries, headers $kde_x_includes])
-	fi
-
-	if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
-		X_INCLUDES=""
-		x_includes="."; dnl better than nothing :-
-	else
-		x_includes=$kde_x_includes
-		X_INCLUDES="-I$x_includes"
-	fi
-
-	if test -z "$ac_x_libraries" || test "x$ac_x_libraries" = xNONE; then
-		X_LDFLAGS=""
-		x_libraries="/usr/lib"; dnl better than nothing :-
-	else
-		x_libraries=$ac_x_libraries
-		X_LDFLAGS="-L$x_libraries"
-	fi
-	all_includes="$all_includes $X_INCLUDES"
-	all_libraries="$all_libraries $X_LDFLAGS"
-
-	AC_SUBST(X_INCLUDES)
-	AC_SUBST(X_LDFLAGS)
-	AC_SUBST(x_libraries)
-	AC_SUBST(x_includes)
-
-	# Check for libraries that X11R6 Xt/Xaw programs need.
-	ac_save_LDFLAGS="$LDFLAGS"
-	test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
-
-	# SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
-	# check for ICE first), but we must link in the order -lSM -lICE or
-	# we get undefined symbols.  So assume we have SM if we have ICE.
-	# These have to be linked with before -lX11, unlike the other
-	# libraries we check for below, so use a different variable.
-	#  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
-	AC_CHECK_LIB(ICE, IceConnectionNumber,
-		[LIBSM="$X_PRELIBS -lSM"], , $X_EXTRA_LIBS)
-	AC_SUBST(LIBSM)
-	LDFLAGS="$ac_save_LDFLAGS"
-
-	AC_SUBST(X_PRE_LIBS)
-
-	LIB_X11='-lX11 $(LIBSOCKET)'
-	AC_SUBST(LIB_X11)
-
-	AC_MSG_CHECKING(for libXext)
-	AC_CACHE_VAL(kde_cv_have_libXext,[
-		kde_ldflags_safe="$LDFLAGS"
-		kde_libs_safe="$LIBS"
-
-		LDFLAGS="$X_LDFLAGS $USER_LDFLAGS"
-		LIBS="-lXext -lX11 $LIBSOCKET"
-
-		AC_TRY_LINK([#include <stdio.h>],[printf("hello Xext\n");],
-			kde_cv_have_libXext=yes,
-			kde_cv_have_libXext=no
-		)
-
-		LDFLAGS=$kde_ldflags_safe
-		LIBS=$kde_libs_safe
-	])
-
-	AC_MSG_RESULT($kde_cv_have_libXext)
-
-	if test "kde_cv_have_libXext" = "no"; then
-		AC_MSG_ERROR([We need a working libXext to proceed. Since configure
-can't find it itself, we stop here assuming that make wouldn't find
-them either.])
-	fi
-
-	AC_LANG_RESTORE
-])