diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:53:16 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:53:16 -0600 |
| commit | 29c3e44e6860d0138dc75cd02c06376a3888beb3 (patch) | |
| tree | 3ec87424a7b49fa346d1f8e36e4e42d0d9fe4eed /acinclude.m4 | |
| parent | a9ba12c66e8d8de08c1e5f53180428f6e7fe687f (diff) | |
| download | kiosktool-29c3e44e6860d0138dc75cd02c06376a3888beb3.tar.gz kiosktool-29c3e44e6860d0138dc75cd02c06376a3888beb3.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index e54961d..6fc5357 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -597,7 +597,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], fi if test -n "$kde32ornewer"; then - KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)]) + KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)]) KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) fi if test -n "$kde33ornewer"; then @@ -1752,7 +1752,7 @@ if test "$kde_qtver" = 1; then kde_check_lib="libtdecore.la" else kde_check_header="ksharedptr.h" - kde_check_lib="libkio.la" + kde_check_lib="libtdeio.la" fi if test -z "$1"; then @@ -2049,7 +2049,7 @@ elif test $kde_qtver = 2; then AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") - AC_SUBST(LIB_KFILE, "-lkfile") + AC_SUBST(LIB_KFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KHTML, "-ltdehtml") AC_SUBST(LIB_KSPELL, "-ltdespell") @@ -2059,7 +2059,7 @@ else AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") - AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)") + AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) |