diff --git a/README b/README index 67fa61580..6615a4b51 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ KOffice is based on KDE ( http://www.kde.org ) which is needed to run KOffice. -You need kdelibs and kdebase installed if you want to compile and run -KOffice. Look in the kdelibs sourcedir for the file COMPILING for help. Also +You need tdelibs and tdebase installed if you want to compile and run +KOffice. Look in the tdelibs sourcedir for the file COMPILING for help. Also look at the website as there are many helpfiles available. KOffice is a collection of office applications linked together by a common diff --git a/README.APPS b/README.APPS index ebdafae4f..7901ebbfe 100644 --- a/README.APPS +++ b/README.APPS @@ -9,7 +9,7 @@ are committed in the 1.5 branch will be forward ported to 1.6 at the time of the release. The real development will happen in trunk, and will eventually lead to -KOffice version 2.0, which will be based on Qt4 and kdelibs4. +KOffice version 2.0, which will be based on Qt4 and tdelibs4. Here is the list of applications and libraries that will be developed in the 1.6 cycle: diff --git a/acinclude.m4 b/acinclude.m4 index ffaf0b1ea..ce4327b18 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -23,8 +23,8 @@ dnl IMPORTANT NOTE: dnl Please do not modify this file unless you expect your modifications to be dnl carried into every other module in the repository. dnl -dnl Single-module modifications are best placed in configure.in for kdelibs -dnl and kdebase or configure.in.in if present. +dnl Single-module modifications are best placed in configure.in for tdelibs +dnl and tdebase or configure.in.in if present. # KDE_PATH_X_DIRECT dnl Internal subroutine of AC_PATH_X. @@ -103,41 +103,41 @@ ac_x_libraries=], [LIBS="$ac_save_LIBS" # First see if replacing the include by lib works. # Check X11 before X11Rn because it is often a symlink to the current release. -for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \ - /usr/X11/lib${kdelibsuff} \ - /usr/X11R6/lib${kdelibsuff} \ - /usr/X11R5/lib${kdelibsuff} \ - /usr/X11R4/lib${kdelibsuff} \ +for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \ + /usr/X11/lib${tdelibsuff} \ + /usr/X11R6/lib${tdelibsuff} \ + /usr/X11R5/lib${tdelibsuff} \ + /usr/X11R4/lib${tdelibsuff} \ \ - /usr/lib${kdelibsuff}/X11 \ - /usr/lib${kdelibsuff}/X11R6 \ - /usr/lib${kdelibsuff}/X11R5 \ - /usr/lib${kdelibsuff}/X11R4 \ + /usr/lib${tdelibsuff}/X11 \ + /usr/lib${tdelibsuff}/X11R6 \ + /usr/lib${tdelibsuff}/X11R5 \ + /usr/lib${tdelibsuff}/X11R4 \ \ - /usr/local/X11/lib${kdelibsuff} \ - /usr/local/X11R6/lib${kdelibsuff} \ - /usr/local/X11R5/lib${kdelibsuff} \ - /usr/local/X11R4/lib${kdelibsuff} \ + /usr/local/X11/lib${tdelibsuff} \ + /usr/local/X11R6/lib${tdelibsuff} \ + /usr/local/X11R5/lib${tdelibsuff} \ + /usr/local/X11R4/lib${tdelibsuff} \ \ - /usr/local/lib${kdelibsuff}/X11 \ - /usr/local/lib${kdelibsuff}/X11R6 \ - /usr/local/lib${kdelibsuff}/X11R5 \ - /usr/local/lib${kdelibsuff}/X11R4 \ + /usr/local/lib${tdelibsuff}/X11 \ + /usr/local/lib${tdelibsuff}/X11R6 \ + /usr/local/lib${tdelibsuff}/X11R5 \ + /usr/local/lib${tdelibsuff}/X11R4 \ \ - /usr/X386/lib${kdelibsuff} \ - /usr/x386/lib${kdelibsuff} \ - /usr/XFree86/lib${kdelibsuff}/X11 \ + /usr/X386/lib${tdelibsuff} \ + /usr/x386/lib${tdelibsuff} \ + /usr/XFree86/lib${tdelibsuff}/X11 \ \ - /usr/lib${kdelibsuff} \ - /usr/local/lib${kdelibsuff} \ - /usr/unsupported/lib${kdelibsuff} \ - /usr/athena/lib${kdelibsuff} \ - /usr/local/x11r5/lib${kdelibsuff} \ - /usr/lpp/Xamples/lib${kdelibsuff} \ - /lib/usr/lib${kdelibsuff}/X11 \ + /usr/lib${tdelibsuff} \ + /usr/local/lib${tdelibsuff} \ + /usr/unsupported/lib${tdelibsuff} \ + /usr/athena/lib${tdelibsuff} \ + /usr/local/x11r5/lib${tdelibsuff} \ + /usr/lpp/Xamples/lib${tdelibsuff} \ + /lib/usr/lib${tdelibsuff}/X11 \ \ - /usr/openwin/lib${kdelibsuff} \ - /usr/openwin/share/lib${kdelibsuff} \ + /usr/openwin/lib${tdelibsuff} \ + /usr/openwin/share/lib${tdelibsuff} \ ; \ do dnl Don't even attempt the hair of trying to link an X program! @@ -378,7 +378,7 @@ if AC_TRY_EVAL(ac_link) && test -s conftest; then else AC_MSG_ERROR([your system fails at linking a small KDE application! Check, if your compiler is installed correctly and if you have used the -same compiler to compile Qt and kdelibs as you did use now. +same compiler to compile Qt and tdelibs as you did use now. For more details about this problem, look at the end of config.log.]) fi @@ -937,7 +937,7 @@ mips-sgi-irix6*) ac_x_includes="." fi if test -z "$ac_x_libraries"; then - ac_x_libraries="/usr/lib${kdelibsuff}" + ac_x_libraries="/usr/lib${tdelibsuff}" fi esac #from now on we use our own again @@ -1418,7 +1418,7 @@ qt_includes="" AC_ARG_WITH(qt-dir, AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]), [ ac_qt_includes="$withval"/include - ac_qt_libraries="$withval"/lib${kdelibsuff} + ac_qt_libraries="$withval"/lib${tdelibsuff} ac_qt_bindir="$withval"/bin ]) @@ -1459,7 +1459,7 @@ ac_qt_includes="$qt_incdir" qt_libdirs="" for dir in $kde_qt_dirs; do - qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir" + qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir" done qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" if test ! "$ac_qt_libraries" = "NO"; then @@ -1644,11 +1644,11 @@ rm -f actest.ui actest.cpp AC_MSG_RESULT([$kde_cv_uic_plugins]) if test "$kde_cv_uic_plugins" != yes; then AC_MSG_ERROR([ -you need to install kdelibs first. +you need to install tdelibs first. -If you did install kdelibs, then the Qt version that is picked up by -this configure is not the same version you used to compile kdelibs. -The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the +If you did install tdelibs, then the Qt version that is picked up by +this configure is not the same version you used to compile tdelibs. +The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the _same Qt version_, compiled with the _same compiler_ and the same Qt configuration settings. ]) @@ -1796,8 +1796,8 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail. So, check this please and use another prefix!]) fi -kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/trinity /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/trinity/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" -test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs" +kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/trinity /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/trinity/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}" +test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${tdelibsuff} $KDEDIR $kde_libdirs" kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir) ac_kde_libraries="$kde_libdir" @@ -1815,7 +1815,7 @@ fi if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then AC_MSG_ERROR([ I can't find the designer plugins. These are required and should have been installed -by kdelibs]) +by tdelibs]) fi if test -n "$kde_widgetdir"; then @@ -1830,7 +1830,7 @@ else ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries" fi -else dnl test -z $1, e.g. from kdelibs +else dnl test -z $1, e.g. from tdelibs ac_cv_have_kde="have_kde=no" @@ -3490,9 +3490,9 @@ AC_DEFUN([KDE_CHECK_LIB64], AC_ARG_ENABLE(libsuffix, AC_HELP_STRING([--enable-libsuffix], [/lib directory suffix (64,32,none,auto[=default])]), - kdelibsuff=$enableval, kdelibsuff="auto") + tdelibsuff=$enableval, tdelibsuff="auto") - if test "$kdelibsuff" = "auto"; then + if test "$tdelibsuff" = "auto"; then cat > conftest.c << EOF #include @@ -3500,26 +3500,26 @@ int main() { return 0; } EOF - kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ + tdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ s,.*/lib\([[^\/]]*\)/.*,\1, p }'` rm -rf conftest.* fi - if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then - kdelibsuff= + if test "$tdelibsuff" = "no" || test "$tdelibsuff" = "none"; then + tdelibsuff= fi - if test -z "$kdelibsuff"; then + if test -z "$tdelibsuff"; then AC_MSG_RESULT([not using lib directory suffix]) AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories) else if test "$libdir" = '${exec_prefix}/lib'; then - libdir="$libdir${kdelibsuff}" + libdir="$libdir${tdelibsuff}" AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms fi - AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${kdelibsuff}"], Suffix for lib directories) - AC_MSG_RESULT([using lib directory suffix $kdelibsuff]) + AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${tdelibsuff}"], Suffix for lib directories) + AC_MSG_RESULT([using lib directory suffix $tdelibsuff]) fi ]) @@ -4544,7 +4544,7 @@ fi PYTHONINC=-I$python_incdir -python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs" +python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs" AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir) if test ! -r $python_libdir/libpython$version.so; then AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir) @@ -4934,7 +4934,7 @@ AC_DEFUN([KDE_CONF_FILES], AC_SUBST(CONF_FILES) ])dnl -dnl This sets the prefix, for arts and kdelibs +dnl This sets the prefix, for arts and tdelibs dnl Do NOT use in any other module. dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde AC_DEFUN([KDE_SET_PREFIX_CORE], @@ -4981,9 +4981,9 @@ AC_DEFUN([KDE_SET_PREFIX], kde_libs_prefix=`$KDECONFIG --prefix` if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then - AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs. + AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs. This means it has been moved since you installed it. - This won't work. Please recompile kdelibs for the new prefix. + This won't work. Please recompile tdelibs for the new prefix. ]) fi kde_libs_htmldir=`$KDECONFIG --install html --expandvars` @@ -5649,7 +5649,7 @@ ssl_includes="" AC_ARG_WITH(ssl-dir, AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]), [ ac_ssl_includes="$withval"/include - ac_ssl_libraries="$withval"/lib$kdelibsuff + ac_ssl_libraries="$withval"/lib$tdelibsuff ]) want_ssl=yes @@ -5669,7 +5669,7 @@ AC_CACHE_VAL(ac_cv_have_ssl, AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir) ac_ssl_includes="$ssl_incdir" - ssl_libdirs="/usr/lib$kdelibsuff /usr/local/lib$kdelibsuff /usr/ssl/lib$kdelibsuff /usr/local/ssl/lib$kdelibsuff $libdir $prefix/lib$kdelibsuff $exec_prefix/lib$kdelibsuff $kde_extra_libs" + ssl_libdirs="/usr/lib$tdelibsuff /usr/local/lib$tdelibsuff /usr/ssl/lib$tdelibsuff /usr/local/ssl/lib$tdelibsuff $libdir $prefix/lib$tdelibsuff $exec_prefix/lib$tdelibsuff $kde_extra_libs" if test ! "$ac_ssl_libraries" = "NO"; then ssl_libdirs="$ac_ssl_libraries $ssl_libdirs" fi @@ -5906,9 +5906,9 @@ dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page dnl also defines KSTUFF_PKG_ERRORS on error AC_DEFUN([KDE_PKG_CHECK_MODULES], [ - PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" + PKG_CONFIG_PATH="$prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" if test "$prefix" != "$kde_libs_prefix"; then - PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" + PKG_CONFIG_PATH="$kde_libs_prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" fi export PKG_CONFIG_PATH PKG_CHECK_MODULES([$1],[$2],[$3],[$4]) diff --git a/autocorrect/Makefile.am b/autocorrect/Makefile.am index fde9d50b8..7003adc15 100644 --- a/autocorrect/Makefile.am +++ b/autocorrect/Makefile.am @@ -1,6 +1,6 @@ # (Is autocorrect.xml still used?) -# WARNING: Do not add any other language here - use kde-i18n/*/data/koffice/autocorrect for that. +# WARNING: Do not add any other language here - use tde-i18n/*/data/koffice/autocorrect for that. scripts_DATA = autocorrect.xml en_US.xml scriptsdir = $(kde_datadir)/koffice/autocorrect diff --git a/changes-1.4 b/changes-1.4 index 95ae5bcb7..a5a176721 100644 --- a/changes-1.4 +++ b/changes-1.4 @@ -84,7 +84,7 @@ kotext (shared by KWord and KPresenter): * Word completion with tooltip * Open links by clicking on them, use hand pointer, show link target in statusbar. * Tab/Shift+Tab for changing indentation in lists -* Rewritten spell-checking support (based on kspell2, the main reason for the kdelibs >= 3.3 requirement) +* Rewritten spell-checking support (based on kspell2, the main reason for the tdelibs >= 3.3 requirement) which is much faster and solves many problems (e.g. KOffice-1.3's hanging right-click-menu) * Improved autocorrection (better URL detection among other things) diff --git a/changes-1.5 b/changes-1.5 index 9ece0340c..0e3b9c78f 100644 --- a/changes-1.5 +++ b/changes-1.5 @@ -5,7 +5,7 @@ - Palettes now have a smart mode where they start floating on small screens and docked on larger screens - ToolBox is no longer duplicated for every view - - Accessibility: Allow speaking texts using the kdeaccessibility tools (KTTS). + - Accessibility: Allow speaking texts using the tdeaccessibility tools (KTTS). - Accessibility: Alt-F8 to set focus to any focusable widget. - Accessibility: F8 and Shift-F8 for mouseless splitter and dock widget sizing. diff --git a/configure.in b/configure.in index e5804415f..1ec137ef7 100644 --- a/configure.in +++ b/configure.in @@ -238,13 +238,13 @@ AC_MSG_CHECKING([for KDE version]) AC_LANG_SAVE AC_LANG_CPLUSPLUS -kdeversion_save_CXXFLAGS="$CXXFLAGS" -kdeversion_safe_LIBS="$LIBS" +tdeversion_save_CXXFLAGS="$CXXFLAGS" +tdeversion_safe_LIBS="$LIBS" LIBS="$LIBS $X_EXTRA_LIBS" CXXFLAGS="$CXXFLAGS $all_includes" AC_COMPILE_IFELSE([ -#include +#include #if ! ( KDE_IS_VERSION( 3, 2, 90 ) ) #error KDE 3.2 #endif @@ -255,7 +255,7 @@ AC_COMPILE_IFELSE([ ) AC_COMPILE_IFELSE([ -#include +#include #if ! ( KDE_IS_VERSION( 3, 3, 90 ) ) #error KDE 3.3 #endif @@ -266,7 +266,7 @@ AC_COMPILE_IFELSE([ ) AC_COMPILE_IFELSE([ -#include +#include #if ! ( KDE_IS_VERSION( 3, 4, 90 ) ) #error KDE 3.4 #endif @@ -277,7 +277,7 @@ AC_COMPILE_IFELSE([ ) AC_COMPILE_IFELSE([ -#include +#include #if ! ( KDE_IS_VERSION( 3, 5, 2 ) ) #error KDE 3.5.x (x < 2) #endif @@ -286,8 +286,8 @@ AC_COMPILE_IFELSE([ , need_trinity51_compat="yes" ) -CXXFLAGS="$kdeversion_save_CXXFLAGS" -LIBS="$kdeversion_safe_LIBS" +CXXFLAGS="$tdeversion_save_CXXFLAGS" +LIBS="$tdeversion_safe_LIBS" AC_LANG_RESTORE if test "$need_trinity2_compat" = "yes"; then @@ -889,7 +889,7 @@ dnl *** Check that the paths given to configure are valid *** fi AC_MSG_CHECKING([for MySQL libraries]) - mysql_libdirs="$ac_mysql_libdir /usr/local/lib$kdelibsuff /usr/lib$kdelibsuff" + mysql_libdirs="$ac_mysql_libdir /usr/local/lib$tdelibsuff /usr/lib$tdelibsuff" AC_FIND_FILE(mysql/libmysqlclient.so, $mysql_libdirs, mysql_libdir) if test -r $mysql_libdir/mysql/libmysqlclient.so; then MYSQL_LIBS=$mysql_libdir @@ -985,7 +985,7 @@ dnl *** Check that the paths given to configure are valid *** fi AC_MSG_CHECKING([for PostgreSQL C API libraries]) - pgsql_libdirs="$ac_pgsql_libdir /usr/local/lib$kdelibsuff /usr/lib$kdelibsuff" + pgsql_libdirs="$ac_pgsql_libdir /usr/local/lib$tdelibsuff /usr/lib$tdelibsuff" AC_FIND_FILE(libpq.so, $pgsql_libdirs, pgsql_libdir) if test -r $pgsql_libdir/libpq.so; then PG_LIBDIR=$pgsql_libdir @@ -1065,7 +1065,7 @@ dnl libpqxx libraries dnl ======================================== if test "$compile_pgsql_plugin" = "yes"; then AC_MSG_CHECKING([for PostgreSQL C++ libraries]) - pqxx_libdirs="$ac_pqxx_libdir /usr/local/lib$kdelibsuff /usr/lib$kdelibsuff" + pqxx_libdirs="$ac_pqxx_libdir /usr/local/lib$tdelibsuff /usr/lib$tdelibsuff" AC_FIND_FILE(libpqxx.so, $pqxx_libdirs, pqxx_libdir) if test -r $pqxx_libdir/libpqxx.so; then PQXX_LIBDIR=$pqxx_libdir @@ -1837,7 +1837,7 @@ AC_CONFIG_FILES([ kexi/data/trinity4compat/Makefile ]) AC_CONFIG_FILES([ kexi/examples/Makefile ]) AC_CONFIG_FILES([ kexi/formeditor/Makefile ]) AC_CONFIG_FILES([ kexi/formeditor/factories/Makefile ]) -AC_CONFIG_FILES([ kexi/formeditor/kdevelop_plugin/Makefile ]) +AC_CONFIG_FILES([ kexi/formeditor/tdevelop_plugin/Makefile ]) AC_CONFIG_FILES([ kexi/formeditor/scripting/Makefile ]) AC_CONFIG_FILES([ kexi/formeditor/test/Makefile ]) AC_CONFIG_FILES([ kexi/kexidb/Makefile ]) @@ -2591,7 +2591,7 @@ fi if test -z "$LIBKSPELL2"; then echo "" - echo "You don't use kdelibs CVS (kspell2 not found). Spell-checking disabled." + echo "You don't use tdelibs CVS (kspell2 not found). Spell-checking disabled." echo "" all_tests=bad fi diff --git a/configure.in.in b/configure.in.in index 21699e044..7a788e3a3 100644 --- a/configure.in.in +++ b/configure.in.in @@ -171,13 +171,13 @@ AC_MSG_CHECKING([for KDE version]) AC_LANG_SAVE AC_LANG_CPLUSPLUS -kdeversion_save_CXXFLAGS="$CXXFLAGS" -kdeversion_safe_LIBS="$LIBS" +tdeversion_save_CXXFLAGS="$CXXFLAGS" +tdeversion_safe_LIBS="$LIBS" LIBS="$LIBS $X_EXTRA_LIBS" CXXFLAGS="$CXXFLAGS $all_includes" AC_COMPILE_IFELSE([ -#include +#include #if ! ( KDE_IS_VERSION( 3, 2, 90 ) ) #error KDE 3.2 #endif @@ -188,7 +188,7 @@ AC_COMPILE_IFELSE([ ) AC_COMPILE_IFELSE([ -#include +#include #if ! ( KDE_IS_VERSION( 3, 3, 90 ) ) #error KDE 3.3 #endif @@ -199,7 +199,7 @@ AC_COMPILE_IFELSE([ ) AC_COMPILE_IFELSE([ -#include +#include #if ! ( KDE_IS_VERSION( 3, 4, 90 ) ) #error KDE 3.4 #endif @@ -210,7 +210,7 @@ AC_COMPILE_IFELSE([ ) AC_COMPILE_IFELSE([ -#include +#include #if ! ( KDE_IS_VERSION( 3, 5, 2 ) ) #error KDE 3.5.x (x < 2) #endif @@ -219,8 +219,8 @@ AC_COMPILE_IFELSE([ , need_trinity51_compat="yes" ) -CXXFLAGS="$kdeversion_save_CXXFLAGS" -LIBS="$kdeversion_safe_LIBS" +CXXFLAGS="$tdeversion_save_CXXFLAGS" +LIBS="$tdeversion_safe_LIBS" AC_LANG_RESTORE if test "$need_trinity2_compat" = "yes"; then diff --git a/doc/chalk/installation.docbook b/doc/chalk/installation.docbook index 4ec595d48..5d3a9afee 100644 --- a/doc/chalk/installation.docbook +++ b/doc/chalk/installation.docbook @@ -18,7 +18,7 @@ application -->