diff -Naur switcher-0.3.7a-orig/admin/acinclude.m4.in switcher-0.3.7a/admin/acinclude.m4.in --- switcher-0.3.7a-orig/admin/acinclude.m4.in 2002-08-05 21:39:32.000000000 +0000 +++ switcher-0.3.7a/admin/acinclude.m4.in 2006-10-29 13:57:18.000000000 +0000 @@ -509,13 +509,6 @@ ]) ]) -AC_DEFUN(KDE_MISSING_ARTS_ERROR, -[ - AC_MSG_ERROR([The important program $1 was not found! -Please check whether you installed aRts correctly. -]) -]) - AC_DEFUN(KDE_SUBST_PROGRAMS, [ @@ -531,8 +524,6 @@ kde_default_bindirs="$exec_prefix/bin $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_ARTS_ERROR(mcopidl)]) - KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)]) KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs]) KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs]) @@ -551,8 +542,6 @@ AC_SUBST(DCOPIDL) AC_SUBST(DCOPIDL2CPP) AC_SUBST(DCOP_DEPENDENCIES) - AC_SUBST(MCOPIDL) - AC_SUBST(ARTSCCONFIG) AC_SUBST(KDECONFIG) AC_SUBST(MEINPROC) AC_SUBST(KDE_XSL_STYLESHEET) @@ -1751,7 +1740,6 @@ printf("kde_wallpaperdir=\\"%s\\"\n", KApplication::kde_wallpaperdir().data()); printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data()); - printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data()); printf("kde_servicesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n"); printf("kde_moduledir=\\"/tmp/dummy\\"\n"); @@ -1853,7 +1841,6 @@ AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_KSPELL, "-lkspell") - AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_KDEPRINT, "-lkdeprint") # these are for backward compatibility AC_SUBST(LIB_KSYCOCA, "-lkio") @@ -1868,7 +1855,6 @@ AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_KSPELL, "-lkspell") - AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_KDEPRINT, "-lkdeprint") else AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)") diff -Naur switcher-0.3.7a/acinclude.m4 switcher-0.3.7a/work/switcher-0.3.7a/acinclude.m4 --- switcher-0.3.7a/acinclude.m4 2003-05-03 12:45:30.000000000 +0000 +++ switcher-0.3.7a/work/switcher-0.3.7a/acinclude.m4 2006-10-29 14:02:24.000000000 +0000 @@ -509,13 +509,6 @@ ]) ]) -AC_DEFUN(KDE_MISSING_ARTS_ERROR, -[ - AC_MSG_ERROR([The important program $1 was not found! -Please check whether you installed aRts correctly. -]) -]) - AC_DEFUN(KDE_SUBST_PROGRAMS, [ @@ -531,8 +524,6 @@ kde_default_bindirs="$exec_prefix/bin $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_ARTS_ERROR(mcopidl)]) - KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)]) KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs]) KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs]) @@ -551,8 +542,6 @@ AC_SUBST(DCOPIDL) AC_SUBST(DCOPIDL2CPP) AC_SUBST(DCOP_DEPENDENCIES) - AC_SUBST(MCOPIDL) - AC_SUBST(ARTSCCONFIG) AC_SUBST(KDECONFIG) AC_SUBST(MEINPROC) AC_SUBST(KDE_XSL_STYLESHEET) @@ -1853,7 +1842,6 @@ AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_KSPELL, "-lkspell") - AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_KDEPRINT, "-lkdeprint") # these are for backward compatibility AC_SUBST(LIB_KSYCOCA, "-lkio") @@ -1868,7 +1856,6 @@ AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_KSPELL, "-lkspell") - AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_KDEPRINT, "-lkdeprint") else AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)") diff -Naur switcher-0.3.7a/aclocal.m4 switcher-0.3.7a/work/switcher-0.3.7a/aclocal.m4 --- switcher-0.3.7a/aclocal.m4 2003-05-03 12:45:35.000000000 +0000 +++ switcher-0.3.7a/work/switcher-0.3.7a/aclocal.m4 2006-10-29 14:03:02.000000000 +0000 @@ -521,13 +521,6 @@ ]) ]) -AC_DEFUN(KDE_MISSING_ARTS_ERROR, -[ - AC_MSG_ERROR([The important program $1 was not found! -Please check whether you installed aRts correctly. -]) -]) - AC_DEFUN(KDE_SUBST_PROGRAMS, [ @@ -543,8 +536,6 @@ kde_default_bindirs="$exec_prefix/bin $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_ARTS_ERROR(mcopidl)]) - KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)]) KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs]) KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs]) @@ -563,8 +554,6 @@ AC_SUBST(DCOPIDL) AC_SUBST(DCOPIDL2CPP) AC_SUBST(DCOP_DEPENDENCIES) - AC_SUBST(MCOPIDL) - AC_SUBST(ARTSCCONFIG) AC_SUBST(KDECONFIG) AC_SUBST(MEINPROC) AC_SUBST(KDE_XSL_STYLESHEET) @@ -1865,7 +1854,6 @@ AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_KSPELL, "-lkspell") - AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_KDEPRINT, "-lkdeprint") # these are for backward compatibility AC_SUBST(LIB_KSYCOCA, "-lkio") @@ -1880,7 +1868,6 @@ AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_KSPELL, "-lkspell") - AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_KDEPRINT, "-lkdeprint") else AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")