diff options
| author | Timothy Pearson <[email protected]> | 2013-01-27 00:53:59 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-27 00:53:59 -0600 |
| commit | 1091bfd4fafc821ce30832b4dde0b996262665a4 (patch) | |
| tree | e516dc952deda03236041ceb5b23353ac2bfa918 | |
| parent | c401bd89541cddd3e1131b604badce5761b8a5fe (diff) | |
| download | knowit-1091bfd4fafc821ce30832b4dde0b996262665a4.tar.gz knowit-1091bfd4fafc821ce30832b4dde0b996262665a4.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
| -rw-r--r-- | acinclude.m4 | 8 | ||||
| -rw-r--r-- | aclocal.m4 | 8 | ||||
| -rw-r--r-- | src/knowit.cpp | 4 | ||||
| -rw-r--r-- | src/knowitlink.cpp | 2 | ||||
| -rw-r--r-- | src/knowitpref.cpp | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index ccfe24d..950f4ca 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -572,7 +572,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], fi if test -n "$trinity2ornewer"; 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 KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [XMLLINT=""]) @@ -1733,7 +1733,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 @@ -2029,7 +2029,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") @@ -2039,7 +2039,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 ]) @@ -584,7 +584,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], fi if test -n "$trinity2ornewer"; 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 KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [XMLLINT=""]) @@ -1745,7 +1745,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 @@ -2041,7 +2041,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") @@ -2051,7 +2051,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 ]) diff --git a/src/knowit.cpp b/src/knowit.cpp index f50ec91..448c7c3 100644 --- a/src/knowit.cpp +++ b/src/knowit.cpp @@ -30,10 +30,10 @@ #include <kaction.h> #include <kcmdlineargs.h> #include <kcolordialog.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tdeversion.h> #include <kedittoolbar.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kkeydialog.h> #include <kmenubar.h> #include <kmessagebox.h> diff --git a/src/knowitlink.cpp b/src/knowitlink.cpp index cd2d068..fc0e871 100644 --- a/src/knowitlink.cpp +++ b/src/knowitlink.cpp @@ -23,7 +23,7 @@ #include <tqlayout.h> #include <tqvbox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kglobal.h> #include <kiconloader.h> #include <klocale.h> diff --git a/src/knowitpref.cpp b/src/knowitpref.cpp index f4dddf6..b9cb871 100644 --- a/src/knowitpref.cpp +++ b/src/knowitpref.cpp @@ -29,7 +29,7 @@ #include <tqlabel.h> #include <tqvbox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kcombobox.h> #include <kglobal.h> #include <kiconloader.h> |