Gentoo Attachment #100709 for bug #150814

View | Details | Raw Unified
Collapse All | Expand All

(-) switcher-0.3.7a-orig/admin/acinclude.m4.in (-14 lines)

Lines 509-521	Link Here

])

])

])

])

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,

AC_DEFUN(KDE_SUBST_PROGRAMS,

Lines 531-538	Link Here

        kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_default_bindirs"

        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(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(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(kde-config, KDECONFIG, [$kde_default_bindirs])

        KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])

        KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])

Lines 551-558	Link Here

        AC_SUBST(DCOPIDL)

        AC_SUBST(DCOPIDL)

        AC_SUBST(DCOPIDL2CPP)

        AC_SUBST(DCOPIDL2CPP)

        AC_SUBST(DCOP_DEPENDENCIES)

        AC_SUBST(DCOP_DEPENDENCIES)

        AC_SUBST(MCOPIDL)

        AC_SUBST(ARTSCCONFIG)

        AC_SUBST(KDECONFIG)

        AC_SUBST(KDECONFIG)

	AC_SUBST(MEINPROC)

	AC_SUBST(MEINPROC)

 	AC_SUBST(KDE_XSL_STYLESHEET)

 	AC_SUBST(KDE_XSL_STYLESHEET)

Lines 1751-1757	Link Here

    printf("kde_wallpaperdir=\\"%s\\"\n",

    printf("kde_wallpaperdir=\\"%s\\"\n",

	KApplication::kde_wallpaperdir().data());

	KApplication::kde_wallpaperdir().data());

    printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().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_servicesdir=\\"/tmp/dummy\\"\n");

    printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");

    printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");

    printf("kde_moduledir=\\"/tmp/dummy\\"\n");

    printf("kde_moduledir=\\"/tmp/dummy\\"\n");

Lines 1853-1859	Link Here

   AC_SUBST(LIB_KAB, "-lkab")

   AC_SUBST(LIB_KAB, "-lkab")

   AC_SUBST(LIB_KHTML, "-lkhtml")

   AC_SUBST(LIB_KHTML, "-lkhtml")

   AC_SUBST(LIB_KSPELL, "-lkspell")

   AC_SUBST(LIB_KSPELL, "-lkspell")

   AC_SUBST(LIB_KPARTS, "-lkparts")

   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")

   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")

# these are for backward compatibility

# these are for backward compatibility

   AC_SUBST(LIB_KSYCOCA, "-lkio")

   AC_SUBST(LIB_KSYCOCA, "-lkio")

Lines 1868-1874	Link Here

   AC_SUBST(LIB_KAB, "-lkab")

   AC_SUBST(LIB_KAB, "-lkab")

   AC_SUBST(LIB_KHTML, "-lkhtml")

   AC_SUBST(LIB_KHTML, "-lkhtml")

   AC_SUBST(LIB_KSPELL, "-lkspell")

   AC_SUBST(LIB_KSPELL, "-lkspell")

   AC_SUBST(LIB_KPARTS, "-lkparts")

   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")

   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")

else

else

   AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")

   AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")

(-) switcher-0.3.7a/acinclude.m4 (-13 lines)

Lines 509-521	Link Here

])

])

])

])

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,

AC_DEFUN(KDE_SUBST_PROGRAMS,

Lines 531-538	Link Here

        kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_default_bindirs"

        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(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(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(kde-config, KDECONFIG, [$kde_default_bindirs])

        KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])

        KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])

Lines 551-558	Link Here

        AC_SUBST(DCOPIDL)

        AC_SUBST(DCOPIDL)

        AC_SUBST(DCOPIDL2CPP)

        AC_SUBST(DCOPIDL2CPP)

        AC_SUBST(DCOP_DEPENDENCIES)

        AC_SUBST(DCOP_DEPENDENCIES)

        AC_SUBST(MCOPIDL)

        AC_SUBST(ARTSCCONFIG)

        AC_SUBST(KDECONFIG)

        AC_SUBST(KDECONFIG)

	AC_SUBST(MEINPROC)

	AC_SUBST(MEINPROC)

 	AC_SUBST(KDE_XSL_STYLESHEET)

 	AC_SUBST(KDE_XSL_STYLESHEET)

Lines 1853-1859	Link Here

   AC_SUBST(LIB_KAB, "-lkab")

   AC_SUBST(LIB_KAB, "-lkab")

   AC_SUBST(LIB_KHTML, "-lkhtml")

   AC_SUBST(LIB_KHTML, "-lkhtml")

   AC_SUBST(LIB_KSPELL, "-lkspell")

   AC_SUBST(LIB_KSPELL, "-lkspell")

   AC_SUBST(LIB_KPARTS, "-lkparts")

   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")

   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")

# these are for backward compatibility

# these are for backward compatibility

   AC_SUBST(LIB_KSYCOCA, "-lkio")

   AC_SUBST(LIB_KSYCOCA, "-lkio")

Lines 1868-1874	Link Here

   AC_SUBST(LIB_KAB, "-lkab")

   AC_SUBST(LIB_KAB, "-lkab")

   AC_SUBST(LIB_KHTML, "-lkhtml")

   AC_SUBST(LIB_KHTML, "-lkhtml")

   AC_SUBST(LIB_KSPELL, "-lkspell")

   AC_SUBST(LIB_KSPELL, "-lkspell")

   AC_SUBST(LIB_KPARTS, "-lkparts")

   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")

   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")

else

else

   AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")

   AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")

(-) switcher-0.3.7a/aclocal.m4 (-13 lines)

Lines 521-533	Link Here

])

])

])

])

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,

AC_DEFUN(KDE_SUBST_PROGRAMS,

Lines 543-550	Link Here

        kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_default_bindirs"

        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(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(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(kde-config, KDECONFIG, [$kde_default_bindirs])

        KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])

        KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])

Lines 563-570	Link Here

        AC_SUBST(DCOPIDL)

        AC_SUBST(DCOPIDL)

        AC_SUBST(DCOPIDL2CPP)

        AC_SUBST(DCOPIDL2CPP)

        AC_SUBST(DCOP_DEPENDENCIES)

        AC_SUBST(DCOP_DEPENDENCIES)

        AC_SUBST(MCOPIDL)

        AC_SUBST(ARTSCCONFIG)

        AC_SUBST(KDECONFIG)

        AC_SUBST(KDECONFIG)

	AC_SUBST(MEINPROC)

	AC_SUBST(MEINPROC)

 	AC_SUBST(KDE_XSL_STYLESHEET)

 	AC_SUBST(KDE_XSL_STYLESHEET)

Lines 1865-1871	Link Here

   AC_SUBST(LIB_KAB, "-lkab")

   AC_SUBST(LIB_KAB, "-lkab")

   AC_SUBST(LIB_KHTML, "-lkhtml")

   AC_SUBST(LIB_KHTML, "-lkhtml")

   AC_SUBST(LIB_KSPELL, "-lkspell")

   AC_SUBST(LIB_KSPELL, "-lkspell")

   AC_SUBST(LIB_KPARTS, "-lkparts")

   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")

   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")

# these are for backward compatibility

# these are for backward compatibility

   AC_SUBST(LIB_KSYCOCA, "-lkio")

   AC_SUBST(LIB_KSYCOCA, "-lkio")

Lines 1880-1886	Link Here

   AC_SUBST(LIB_KAB, "-lkab")

   AC_SUBST(LIB_KAB, "-lkab")

   AC_SUBST(LIB_KHTML, "-lkhtml")

   AC_SUBST(LIB_KHTML, "-lkhtml")

   AC_SUBST(LIB_KSPELL, "-lkspell")

   AC_SUBST(LIB_KSPELL, "-lkspell")

   AC_SUBST(LIB_KPARTS, "-lkparts")

   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")

   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")

else

else

   AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")

   AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")

Attachment #100709: switcher-0.3.7a-noarts.patch for bug #150814