diff --git a/Makefile.am b/Makefile.am index 3a5bf85..f046d53 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,8 +1,8 @@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## SUBDIRS = doc knights media po -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ # not a GNU package. You can remove this line, if # have all needed files, that a GNU package needs AUTOMAKE_OPTIONS = foreign diff --git a/acinclude.m4 b/acinclude.m4 index 77b4a6e..fe82481 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. dnl ------------------------------------------------------------------------ dnl Forward compatibility macros (make autoconf 2.13 look like 2.50), @@ -113,41 +113,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! @@ -373,7 +373,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 @@ -565,9 +565,9 @@ AC_DEFUN(KDE_SUBST_PROGRAMS, if test -x "$KDECONFIG"; then # it can be "compiled" 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` @@ -845,7 +845,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 @@ -1366,7 +1366,7 @@ qt_includes="" AC_ARG_WITH(qt-dir, [ --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 ]) @@ -1407,7 +1407,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 @@ -1577,7 +1577,7 @@ rm -f actest.ui actest.cpp if test "$kde_cv_uic_plugins" = yes; then AC_MSG_RESULT([yes]) else - AC_MSG_ERROR([not found - you need to install kdelibs first.]) + AC_MSG_ERROR([not found - you need to install tdelibs first.]) fi fi ]) @@ -1635,12 +1635,12 @@ if test "${prefix}" != NONE; then if test "${exec_prefix}" != NONE; then kde_libraries=${libdir} ac_kde_libraries=$libdir - if test "$ac_kde_libraries" = '${exec_prefix}/lib'${kdelibsuff}; then - ac_kde_libraries=$exec_prefix/lib${kdelibsuff} + if test "$ac_kde_libraries" = '${exec_prefix}/lib'${tdelibsuff}; then + ac_kde_libraries=$exec_prefix/lib${tdelibsuff} fi else - kde_libraries=${prefix}/lib${kdelibsuff} - ac_kde_libraries=$prefix/lib${kdelibsuff} + kde_libraries=${prefix}/lib${tdelibsuff} + ac_kde_libraries=$prefix/lib${tdelibsuff} fi else ac_kde_includes= @@ -1674,8 +1674,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" @@ -1693,7 +1693,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 @@ -2959,28 +2959,28 @@ See http:://objprelink.sourceforge.net for details: AC_DEFUN(KDE_CHECK_LIB64, [ - kdelibsuff=none + tdelibsuff=none AC_ARG_ENABLE(libsuffix, AC_HELP_STRING([--enable-libsuffix], [/lib directory suffix (64,32,none)]), - kdelibsuff=$enableval) - if test "$kdelibsuff" = "none"; then + tdelibsuff=$enableval) + if test "$tdelibsuff" = "none"; then if test -d /lib64 ; then - kdelibsuff=64 + tdelibsuff=64 else - kdelibsuff= + tdelibsuff= fi 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 ]) @@ -5179,7 +5179,7 @@ ssl_includes="" AC_ARG_WITH(ssl-dir, [ --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 @@ -5199,7 +5199,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 diff --git a/aclocal.m4 b/aclocal.m4 index 723d30a..8116227 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -35,8 +35,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. dnl ------------------------------------------------------------------------ dnl Forward compatibility macros (make autoconf 2.13 look like 2.50), @@ -125,41 +125,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! @@ -385,7 +385,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 @@ -577,9 +577,9 @@ AC_DEFUN(KDE_SUBST_PROGRAMS, if test -x "$KDECONFIG"; then # it can be "compiled" 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` @@ -857,7 +857,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 @@ -1378,7 +1378,7 @@ qt_includes="" AC_ARG_WITH(qt-dir, [ --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 ]) @@ -1419,7 +1419,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 @@ -1589,7 +1589,7 @@ rm -f actest.ui actest.cpp if test "$kde_cv_uic_plugins" = yes; then AC_MSG_RESULT([yes]) else - AC_MSG_ERROR([not found - you need to install kdelibs first.]) + AC_MSG_ERROR([not found - you need to install tdelibs first.]) fi fi ]) @@ -1647,12 +1647,12 @@ if test "${prefix}" != NONE; then if test "${exec_prefix}" != NONE; then kde_libraries=${libdir} ac_kde_libraries=$libdir - if test "$ac_kde_libraries" = '${exec_prefix}/lib'${kdelibsuff}; then - ac_kde_libraries=$exec_prefix/lib${kdelibsuff} + if test "$ac_kde_libraries" = '${exec_prefix}/lib'${tdelibsuff}; then + ac_kde_libraries=$exec_prefix/lib${tdelibsuff} fi else - kde_libraries=${prefix}/lib${kdelibsuff} - ac_kde_libraries=$prefix/lib${kdelibsuff} + kde_libraries=${prefix}/lib${tdelibsuff} + ac_kde_libraries=$prefix/lib${tdelibsuff} fi else ac_kde_includes= @@ -1686,8 +1686,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="/opt/trinity/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="/opt/trinity/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" @@ -1705,7 +1705,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 @@ -2971,28 +2971,28 @@ See http:://objprelink.sourceforge.net for details: AC_DEFUN(KDE_CHECK_LIB64, [ - kdelibsuff=none + tdelibsuff=none AC_ARG_ENABLE(libsuffix, AC_HELP_STRING([--enable-libsuffix], [/lib directory suffix (64,32,none)]), - kdelibsuff=$enableval) - if test "$kdelibsuff" = "none"; then + tdelibsuff=$enableval) + if test "$tdelibsuff" = "none"; then if test -d /lib64 ; then - kdelibsuff=64 + tdelibsuff=64 else - kdelibsuff= + tdelibsuff= fi 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 ]) @@ -5191,7 +5191,7 @@ ssl_includes="" AC_ARG_WITH(ssl-dir, [ --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 @@ -5211,7 +5211,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 diff --git a/doc/Makefile.am b/doc/Makefile.am index c2914d0..a2f6526 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,9 +1,9 @@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## EXTRA_DIST = help_en.docbook help_fr.docbook -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ MAINTAINERCLEANFILES = ./*.html CLEANFILES = core *~ .deps/* doc/*~ *.orig changes.docbook diff --git a/doc/Makefile.in.backup b/doc/Makefile.in.backup index c060d48..2fc7e71 100644 --- a/doc/Makefile.in.backup +++ b/doc/Makefile.in.backup @@ -13,7 +13,7 @@ @SET_MAKE@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## SHELL = @SHELL@ @@ -242,7 +242,7 @@ x_libraries = @x_libraries@ EXTRA_DIST = help_en.docbook help_fr.docbook -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ MAINTAINERCLEANFILES = ./*.html CLEANFILES = core *~ .deps/* doc/*~ *.orig changes.docbook DISTCLEANFILES = Makefile.in Makefile diff --git a/knights/Makefile.am b/knights/Makefile.am index 5dbe923..7a07e72 100644 --- a/knights/Makefile.am +++ b/knights/Makefile.am @@ -1,7 +1,7 @@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## bin_PROGRAMS = knights -## INCLUDES were found outside kdevelop specific part +## INCLUDES were found outside tdevelop specific part knights_SOURCES = board_2d.cpp board_base.cpp setpagedisplay.cpp proto_xboard.cpp dlg_selectengine.cpp thinbuttons.cpp pgn.cpp io_engine.cpp dlg_challenge.cpp idmanager.cpp challenge_graph.cpp dlg_login.cpp tabgrip.cpp tabpage.cpp tab_seeklist.cpp dlg_engine.cpp setpageaudio.cpp proto_base.cpp dlg_server.cpp core.cpp match_param.cpp knightspixcache.cpp dlg_settings.cpp console.cpp match.cpp setpagegeneral.cpp splash.cpp audio.cpp main.cpp logic.cpp list_pgn.cpp challenge_graph_view.cpp accel.cpp dlg_selectemail.cpp challenge_rectangle.cpp knightstextview.cpp tabmanager.cpp command.cpp dlg_newmatch.cpp chessclock.cpp dlg_promote.cpp resource.cpp tabbox.cpp io_internet.cpp challenge_game.cpp knights.cpp tab_pgnview.cpp io_base.cpp wiz_setup.cpp setpageservers.cpp proto_uci.cpp setpageengines.cpp knights_LDADD = $(LIB_QT) -lartskde -lkio -ltdeprint -ltdeui -ltdecore $(LIBSOCKET) -lsoundserver_idl -lkmedia2_idl -lartsflow_idl -lmcop @@ -18,7 +18,7 @@ uninstall-local: -rm -f $(kde_mimedir)/application/pgn.desktop -rm -f $(kde_appsdir)/Games/Board/knights.desktop -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ # this 10 paths are KDE specific. Use them: # kde_htmldir Where your docs should go to. (contains lang subdirs) # kde_appsdir Where your application file (.kdelnk) should go to. diff --git a/knights/main.cpp b/knights/main.cpp index 02c4d6d..c68ae43 100644 --- a/knights/main.cpp +++ b/knights/main.cpp @@ -58,7 +58,7 @@ int main(int argc, char *argv[]) ""); aboutData.addCredit("Harald Fernengel", I18N_NOOP("KDE3 Compatability Patch"), - "harry@kdevelop.org", + "harry@tdevelop.org", ""); aboutData.addCredit("Tim Mann", I18N_NOOP("XBoard protocol"), diff --git a/media/Makefile.am b/media/Makefile.am index 1458b76..daa0fce 100644 --- a/media/Makefile.am +++ b/media/Makefile.am @@ -1,4 +1,4 @@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## EXTRA_DIST = hi48-mime-pgn.png hi16-mime-pgn.png KSDefault.tar.gz default-portrait.jpg hi64-app-knights.png pgn_template.kml hi64-mime-pgn.png hi32-mime-pgn.png icon-general.png hi32-app-knights.png default-engine-portrait.jpg KBDefault.tar.gz wizard.png hi48-app-knights.png KCDefault.tar.gz hi16-app-knights.png icon-display.png Makefile.am @@ -61,5 +61,5 @@ uninstall-local: -rm -f $(kde_icondir)/hicolor/16x16/apps/knights.png -rm -f $(kde_datadir)/knights/icon-display.png -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ diff --git a/po/Makefile.am b/po/Makefile.am index 5e620c8..4c8c8ef 100644 --- a/po/Makefile.am +++ b/po/Makefile.am @@ -1,7 +1,7 @@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## POFILES = AUTO EXTRA_DIST = de.gmo es.gmo fi.gmo et.gmo fr.gmo it.gmo -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############