diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:55:01 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:55:01 -0600 |
| commit | 920f0d9622f31cb0d7fd3023d08c923cdc1f4dd3 (patch) | |
| tree | dc488eaaaf59b5fd8b8b96382c8283b745c4357f /koffice-i18n-nb/acinclude.m4 | |
| parent | b44bfb1dc651c450478fd27395f38c57e409e2c5 (diff) | |
| download | koffice-i18n-920f0d9622f31cb0d7fd3023d08c923cdc1f4dd3.tar.gz koffice-i18n-920f0d9622f31cb0d7fd3023d08c923cdc1f4dd3.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'koffice-i18n-nb/acinclude.m4')
| -rw-r--r-- | koffice-i18n-nb/acinclude.m4 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/koffice-i18n-nb/acinclude.m4 b/koffice-i18n-nb/acinclude.m4 index fed43974..5a22f868 100644 --- a/koffice-i18n-nb/acinclude.m4 +++ b/koffice-i18n-nb/acinclude.m4 @@ -602,7 +602,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 @@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then kde_check_lib="libkdecore.la" else kde_check_header="ksharedptr.h" - kde_check_lib="libkio.la" + kde_check_lib="libtdeio.la" fi if test -z "$1"; then @@ -2094,7 +2094,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") @@ -2104,7 +2104,7 @@ else AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)") AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)") - AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)") + AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)") fi ]) |