TDE
/
kommando
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kommando
0
0
Fork 0
Code Issues Releases Wiki Activity

Raw KDE->TDE conversion using tde/scripts/conversions/kde-tde/convert_existing_kde3_app_to_tde

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/1/head
Michele Calgaro 11 months ago
parent 7665c8d3f7
commit 3b8c44efa3
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
36 changed files with 1459 additions and 1459 deletions
Show Stats Download Patch File Download Diff File

28
Makefile.in
Unescape View File

@ -167,22 +167,22 @@ LIBUTIL = @LIBUTIL@
LIBZ = @LIBZ@ LIBZ = @LIBZ@
LIB_KAB = @LIB_KAB@ LIB_KAB = @LIB_KAB@
LIB_KABC = @LIB_KABC@ LIB_KABC = @LIB_KABC@
LIB_KDECORE = @LIB_KDECORE@ LIB_TDECORE = @LIB_TDECORE@
LIB_KDEPIM = @LIB_KDEPIM@ LIB_TDEPIM = @LIB_TDEPIM@
LIB_KDEPRINT = @LIB_KDEPRINT@ LIB_TDEPRINT = @LIB_TDEPRINT@
LIB_KDEUI = @LIB_KDEUI@ LIB_TDEUI = @LIB_TDEUI@
LIB_KDNSSD = @LIB_KDNSSD@ LIB_TDEDNSSD = @LIB_TDEDNSSD@
LIB_KFILE = @LIB_KFILE@ LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@ LIB_KFM = @LIB_KFM@
LIB_KHTML = @LIB_KHTML@ LIB_TDEHTML = @LIB_TDEHTML@
LIB_KIMPROXY = @LIB_KIMPROXY@ LIB_TDEIMPROXY = @LIB_TDEIMPROXY@
LIB_KIO = @LIB_KIO@ LIB_TDEIO = @LIB_TDEIO@
LIB_KJS = @LIB_KJS@ LIB_KJS = @LIB_KJS@
LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
LIB_KPARTS = @LIB_KPARTS@ LIB_TDEPARTS = @LIB_TDEPARTS@
LIB_KSPELL = @LIB_KSPELL@ LIB_TDESPELL = @LIB_TDESPELL@
LIB_KSYCOCA = @LIB_KSYCOCA@ LIB_TDESYCOCA = @LIB_TDESYCOCA@
LIB_KUTILS = @LIB_KUTILS@ LIB_TDEUTILS = @LIB_TDEUTILS@
LIB_POLL = @LIB_POLL@ LIB_POLL = @LIB_POLL@
LIB_QPE = @LIB_QPE@ LIB_QPE = @LIB_QPE@
LIB_QT = @LIB_QT@ LIB_QT = @LIB_QT@
@ -193,7 +193,7 @@ LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MAKETDEWIDGETS = @MAKETDEWIDGETS@
MCOPIDL = @MCOPIDL@ MCOPIDL = @MCOPIDL@
MEINPROC = @MEINPROC@ MEINPROC = @MEINPROC@
MOC = @MOC@ MOC = @MOC@
@ -292,7 +292,7 @@ kde_styledir = @kde_styledir@
kde_templatesdir = @kde_templatesdir@ kde_templatesdir = @kde_templatesdir@
kde_wallpaperdir = @kde_wallpaperdir@ kde_wallpaperdir = @kde_wallpaperdir@
kde_widgetdir = @kde_widgetdir@ kde_widgetdir = @kde_widgetdir@
kdeinitdir = @kdeinitdir@ tdeinitdir = @tdeinitdir@
libdir = @libdir@ libdir = @libdir@
libexecdir = @libexecdir@ libexecdir = @libexecdir@
localstatedir = @localstatedir@ localstatedir = @localstatedir@

262
acinclude.m4
Unescape View File

@ -23,8 +23,8 @@ dnl IMPORTANT NOTE:
dnl Please do not modify this file unless you expect your modifications to be dnl Please do not modify this file unless you expect your modifications to be
dnl carried into every other module in the repository. dnl carried into every other module in the repository.
dnl dnl
dnl Single-module modifications are best placed in configure.in for kdelibs dnl Single-module modifications are best placed in configure.in for tdelibs
dnl and kdebase or configure.in.in if present. dnl and tdebase or configure.in.in if present.
# KDE_PATH_X_DIRECT # KDE_PATH_X_DIRECT
dnl Internal subroutine of AC_PATH_X. dnl Internal subroutine of AC_PATH_X.
@ -103,41 +103,41 @@ ac_x_libraries=],
[LIBS="$ac_save_LIBS" [LIBS="$ac_save_LIBS"
# First see if replacing the include by lib works. # First see if replacing the include by lib works.
# Check X11 before X11Rn because it is often a symlink to the current release. # 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}/` \ for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \
/usr/X11/lib${kdelibsuff} \ /usr/X11/lib${tdelibsuff} \
/usr/X11R6/lib${kdelibsuff} \ /usr/X11R6/lib${tdelibsuff} \
/usr/X11R5/lib${kdelibsuff} \ /usr/X11R5/lib${tdelibsuff} \
/usr/X11R4/lib${kdelibsuff} \ /usr/X11R4/lib${tdelibsuff} \
\ \
/usr/lib${kdelibsuff}/X11 \ /usr/lib${tdelibsuff}/X11 \
/usr/lib${kdelibsuff}/X11R6 \ /usr/lib${tdelibsuff}/X11R6 \
/usr/lib${kdelibsuff}/X11R5 \ /usr/lib${tdelibsuff}/X11R5 \
/usr/lib${kdelibsuff}/X11R4 \ /usr/lib${tdelibsuff}/X11R4 \
\ \
/usr/local/X11/lib${kdelibsuff} \ /usr/local/X11/lib${tdelibsuff} \
/usr/local/X11R6/lib${kdelibsuff} \ /usr/local/X11R6/lib${tdelibsuff} \
/usr/local/X11R5/lib${kdelibsuff} \ /usr/local/X11R5/lib${tdelibsuff} \
/usr/local/X11R4/lib${kdelibsuff} \ /usr/local/X11R4/lib${tdelibsuff} \
\ \
/usr/local/lib${kdelibsuff}/X11 \ /usr/local/lib${tdelibsuff}/X11 \
/usr/local/lib${kdelibsuff}/X11R6 \ /usr/local/lib${tdelibsuff}/X11R6 \
/usr/local/lib${kdelibsuff}/X11R5 \ /usr/local/lib${tdelibsuff}/X11R5 \
/usr/local/lib${kdelibsuff}/X11R4 \ /usr/local/lib${tdelibsuff}/X11R4 \
\ \
/usr/X386/lib${kdelibsuff} \ /usr/X386/lib${tdelibsuff} \
/usr/x386/lib${kdelibsuff} \ /usr/x386/lib${tdelibsuff} \
/usr/XFree86/lib${kdelibsuff}/X11 \ /usr/XFree86/lib${tdelibsuff}/X11 \
\ \
/usr/lib${kdelibsuff} \ /usr/lib${tdelibsuff} \
/usr/local/lib${kdelibsuff} \ /usr/local/lib${tdelibsuff} \
/usr/unsupported/lib${kdelibsuff} \ /usr/unsupported/lib${tdelibsuff} \
/usr/athena/lib${kdelibsuff} \ /usr/athena/lib${tdelibsuff} \
/usr/local/x11r5/lib${kdelibsuff} \ /usr/local/x11r5/lib${tdelibsuff} \
/usr/lpp/Xamples/lib${kdelibsuff} \ /usr/lpp/Xamples/lib${tdelibsuff} \
/lib/usr/lib${kdelibsuff}/X11 \ /lib/usr/lib${tdelibsuff}/X11 \
\ \
/usr/openwin/lib${kdelibsuff} \ /usr/openwin/lib${tdelibsuff} \
/usr/openwin/share/lib${kdelibsuff} \ /usr/openwin/share/lib${tdelibsuff} \
; \ ; \
do do
dnl Don't even attempt the hair of trying to link an X program! dnl Don't even attempt the hair of trying to link an X program!
@ -371,24 +371,24 @@ AC_DEFUN([KDE_1_CHECK_PATHS],
fi fi
AC_MSG_CHECKING([for KDE libraries installed]) AC_MSG_CHECKING([for KDE libraries installed])
ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5' ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5'
if AC_TRY_EVAL(ac_link) && test -s conftest; then if AC_TRY_EVAL(ac_link) && test -s conftest; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
else else
AC_MSG_ERROR([your system fails at linking a small KDE application! 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 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.]) For more details about this problem, look at the end of config.log.])
fi fi
if eval `KDEDIR= ./conftest 2>&5`; then if eval `TDEDIR= ./conftest 2>&5`; then
kde_result=done kde_result=done
else else
kde_result=problems kde_result=problems
fi fi
KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
kde_have_all_paths=yes kde_have_all_paths=yes
KDE_SET_PATHS($kde_result) KDE_SET_PATHS($kde_result)
@ -547,11 +547,11 @@ Please check whether you installed aRts correctly or use
AC_DEFUN([KDE_SET_DEFAULT_BINDIRS], AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
[ [
kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin" kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs" test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
if test -n "$KDEDIRS"; then if test -n "$TDEDIRS"; then
kde_save_IFS=$IFS kde_save_IFS=$IFS
IFS=: IFS=:
for dir in $KDEDIRS; do for dir in $TDEDIRS; do
kde_default_bindirs="$dir/bin $kde_default_bindirs " kde_default_bindirs="$dir/bin $kde_default_bindirs "
done done
IFS=$kde_save_IFS IFS=$kde_save_IFS
@ -597,18 +597,18 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi fi
if test -n "$kde32ornewer"; then 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)]) KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
fi fi
if test -n "$kde33ornewer"; then if test -n "$kde33ornewer"; then
KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)]) KDE_FIND_PATH(maketdewidgets, MAKETDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(maketdewidgets)])
AC_SUBST(MAKEKDEWIDGETS) AC_SUBST(MAKETDEWIDGETS)
fi fi
KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""]) KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then
kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share" kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs" test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs"
AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET) AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
if test "$KDE_XSL_STYLESHEET" = "NO"; then if test "$KDE_XSL_STYLESHEET" = "NO"; then
KDE_XSL_STYLESHEET="" KDE_XSL_STYLESHEET=""
@ -705,7 +705,7 @@ AC_SUBST(kde_templatesdir)
AC_SUBST(kde_servicesdir) AC_SUBST(kde_servicesdir)
AC_SUBST(kde_servicetypesdir) AC_SUBST(kde_servicetypesdir)
AC_SUBST(kde_moduledir) AC_SUBST(kde_moduledir)
AC_SUBST(kdeinitdir, '$(kde_moduledir)') AC_SUBST(tdeinitdir, '$(kde_moduledir)')
AC_SUBST(kde_styledir) AC_SUBST(kde_styledir)
AC_SUBST(kde_widgetdir) AC_SUBST(kde_widgetdir)
if test "$kde_qtver" = 1; then if test "$kde_qtver" = 1; then
@ -931,7 +931,7 @@ mips-sgi-irix6*)
ac_x_includes="." ac_x_includes="."
fi fi
if test -z "$ac_x_libraries"; then if test -z "$ac_x_libraries"; then
ac_x_libraries="/usr/lib${kdelibsuff}" ac_x_libraries="/usr/lib${tdelibsuff}"
fi fi
esac esac
#from now on we use our own again #from now on we use our own again
@ -1419,7 +1419,7 @@ qt_includes=""
AC_ARG_WITH(qt-dir, AC_ARG_WITH(qt-dir,
AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]), AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]),
[ ac_qt_includes="$withval"/include [ ac_qt_includes="$withval"/include
ac_qt_libraries="$withval"/lib${kdelibsuff} ac_qt_libraries="$withval"/lib${tdelibsuff}
ac_qt_bindir="$withval"/bin ac_qt_bindir="$withval"/bin
]) ])
@ -1460,7 +1460,7 @@ ac_qt_includes="$qt_incdir"
qt_libdirs="" qt_libdirs=""
for dir in $kde_qt_dirs; do for dir in $kde_qt_dirs; do
qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir" qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir"
done done
qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
if test ! "$ac_qt_libraries" = "NO"; then if test ! "$ac_qt_libraries" = "NO"; then
@ -1645,11 +1645,11 @@ rm -f actest.ui actest.cpp
AC_MSG_RESULT([$kde_cv_uic_plugins]) AC_MSG_RESULT([$kde_cv_uic_plugins])
if test "$kde_cv_uic_plugins" != yes; then if test "$kde_cv_uic_plugins" != yes; then
AC_MSG_ERROR([ 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 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 kdelibs. this configure is not the same version you used to compile tdelibs.
The Qt Plugin installed by kdelibs is *ONLY* loadable if its the The Qt Plugin installed by tdelibs is *ONLY* loadable if its the
same Qt version, compiled with the same compiler and the same Qt same Qt version, compiled with the same compiler and the same Qt
configuration settings. configuration settings.
]) ])
@ -1786,16 +1786,16 @@ AC_CACHE_VAL(ac_cv_have_kde,
if test "$kde_qtver" = 1; then if test "$kde_qtver" = 1; then
kde_check_header="ksock.h" kde_check_header="ksock.h"
kde_check_lib="libkdecore.la" kde_check_lib="libtdecore.la"
else else
kde_check_header="ksharedptr.h" kde_check_header="ksharedptr.h"
kde_check_lib="libkio.la" kde_check_lib="libtdeio.la"
fi fi
if test -z "$1"; then if test -z "$1"; then
kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs" test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs"
kde_incdirs="$ac_kde_includes $kde_incdirs" kde_incdirs="$ac_kde_includes $kde_incdirs"
AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir) AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
ac_kde_includes="$kde_incdir" ac_kde_includes="$kde_incdir"
@ -1806,15 +1806,15 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail.
So, check this please and use another prefix!]) So, check this please and use another prefix!])
fi 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}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" 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}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}"
test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs" test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs"
kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir) AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
ac_kde_libraries="$kde_libdir" ac_kde_libraries="$kde_libdir"
kde_widgetdir=NO kde_widgetdir=NO
dnl this might be somewhere else dnl this might be somewhere else
AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir) AC_FIND_FILE("kde3/plugins/designer/tdewidgets.la", $kde_libdirs, kde_widgetdir)
if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
AC_MSG_ERROR([ AC_MSG_ERROR([
@ -1822,10 +1822,10 @@ in the prefix, you've chosen, are no KDE libraries installed. This will fail.
So, check this please and use another prefix!]) So, check this please and use another prefix!])
fi fi
if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/tdewidgets.la"; then
AC_MSG_ERROR([ AC_MSG_ERROR([
I can't find the designer plugins. These are required and should have been installed I can't find the designer plugins. These are required and should have been installed
by kdelibs]) by tdelibs])
fi fi
if test -n "$kde_widgetdir"; then if test -n "$kde_widgetdir"; then
@ -1840,7 +1840,7 @@ else
ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries" ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
fi 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" ac_cv_have_kde="have_kde=no"
@ -1980,20 +1980,20 @@ cat > conftest.$ac_ext <<EOF
#include <kapp.h> #include <kapp.h>
int main() { int main() {
printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data()); printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data()); printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data()); printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data()); printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data()); printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data()); printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data()); printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data()); printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data()); printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data()); printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
printf("kde_wallpaperdir=\\"%s\\"\n", printf("kde_wallpaperdir=\\"%s\\"\n",
KApplication::kde_wallpaperdir().data()); TDEApplication::kde_wallpaperdir().data());
printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data()); printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data()); printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
printf("kde_servicesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
printf("kde_moduledir=\\"/tmp/dummy\\"\n"); printf("kde_moduledir=\\"/tmp/dummy\\"\n");
@ -2031,7 +2031,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
kde_cxxflags_safe="$CXXFLAGS" kde_cxxflags_safe="$CXXFLAGS"
LIBS="-lkde-qt-addon $LIBQT $LIBS" LIBS="-lkde-qt-addon $LIBQT $LIBS"
CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes" CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes"
LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS" LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
AC_TRY_LINK([ AC_TRY_LINK([
@ -2064,43 +2064,43 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
AC_REQUIRE([K_PATH_X]) AC_REQUIRE([K_PATH_X])
if test $kde_qtver = 3; then if test $kde_qtver = 3; then
AC_SUBST(LIB_KDECORE, "-lkdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_KDEUI, "-lkdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lkabc") AC_SUBST(LIB_KABC, "-ltdeabc")
AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_KDEPRINT, "-lkdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-lkutils") AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
AC_SUBST(LIB_KDEPIM, "-lkdepim") AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-lkimproxy") AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-lkdnssd") AC_SUBST(LIB_TDEDNSSD, "-ltdednssd")
# these are for backward compatibility # these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-lkio") AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
AC_SUBST(LIB_KFILE, "-lkio") AC_SUBST(LIB_KFILE, "-ltdeio")
elif test $kde_qtver = 2; then elif test $kde_qtver = 2; then
AC_SUBST(LIB_KDECORE, "-lkdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_KDEUI, "-lkdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_KSYCOCA, "-lksycoca") AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-lkfile") AC_SUBST(LIB_KFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_KDEPRINT, "-lkdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else else
AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)") AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
fi fi
]) ])
@ -2165,7 +2165,7 @@ if test "x$kde_cv_func_$1" = xyes; then
else else
case "$1" in case "$1" in
setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat) setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
kde_cv_proto_$1="yes - in libkdefakes" kde_cv_proto_$1="yes - in libtdefakes"
;; ;;
*) *)
kde_cv_proto_$1=unknown kde_cv_proto_$1=unknown
@ -2484,7 +2484,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif]) AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
else else
AC_MSG_ERROR(You need giflib30. Please install the kdesupport package) AC_MSG_ERROR(You need giflib30. Please install the tdesupport package)
fi fi
]) ])
@ -2548,7 +2548,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
test "x$jpeg_incdir" = xNO && jpeg_incdir= test "x$jpeg_incdir" = xNO && jpeg_incdir=
dnl if headers _and_ libraries are missing, this is no error, and we dnl if headers _and_ libraries are missing, this is no error, and we
dnl continue with a warning (the user will get no jpeg support in khtml) dnl continue with a warning (the user will get no jpeg support in tdehtml)
dnl if only one is missing, it means a configuration error, but we still dnl if only one is missing, it means a configuration error, but we still
dnl only warn dnl only warn
if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@ -3290,29 +3290,29 @@ AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch config
AC_DEFUN([KDE_CHECK_LIB64], AC_DEFUN([KDE_CHECK_LIB64],
[ [
kdelibsuff="$kde_libs_suffix" tdelibsuff="$kde_libs_suffix"
if test -z "$kdelibsuff"; then if test -z "$tdelibsuff"; then
kdelibsuff=no tdelibsuff=no
fi fi
AC_ARG_ENABLE(libsuffix, AC_ARG_ENABLE(libsuffix,
AC_HELP_STRING([--enable-libsuffix], AC_HELP_STRING([--enable-libsuffix],
[/lib directory suffix (64,32,none[=default])]), [/lib directory suffix (64,32,none[=default])]),
kdelibsuff=$enableval) tdelibsuff=$enableval)
# TODO: add an auto case that compiles a little C app to check # TODO: add an auto case that compiles a little C app to check
# where the glibc is # where the glibc is
if test "$kdelibsuff" = "no"; then if test "$tdelibsuff" = "no"; then
kdelibsuff= tdelibsuff=
fi fi
if test -z "$kdelibsuff"; then if test -z "$tdelibsuff"; then
AC_MSG_RESULT([not using lib directory suffix]) AC_MSG_RESULT([not using lib directory suffix])
AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories) AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories)
else else
if test "$libdir" = '${exec_prefix}/lib'; then if test "$libdir" = '${exec_prefix}/lib'; then
libdir="$libdir${kdelibsuff}" libdir="$libdir${tdelibsuff}"
AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms
fi fi
AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${kdelibsuff}"], Suffix for lib directories) AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${tdelibsuff}"], Suffix for lib directories)
AC_MSG_RESULT([using lib directory suffix $kdelibsuff]) AC_MSG_RESULT([using lib directory suffix $tdelibsuff])
fi fi
]) ])
@ -3330,7 +3330,7 @@ AC_CANONICAL_SYSTEM
AC_ARG_PROGRAM AC_ARG_PROGRAM
AM_INIT_AUTOMAKE($1, $2) AM_INIT_AUTOMAKE($1, $2)
AM_DISABLE_LIBRARIES AM_DISABLE_LIBRARIES
AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
AC_CHECK_COMPILERS AC_CHECK_COMPILERS
KDE_PROG_LIBTOOL KDE_PROG_LIBTOOL
AM_KDE_WITH_NLS AM_KDE_WITH_NLS
@ -4336,7 +4336,7 @@ fi
PYTHONINC=-I$python_incdir 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) AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir)
if test ! -r $python_libdir/libpython$version.so; then if test ! -r $python_libdir/libpython$version.so; then
AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir) AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)
@ -4724,14 +4724,14 @@ AC_DEFUN([KDE_CONF_FILES],
AC_SUBST(CONF_FILES) AC_SUBST(CONF_FILES)
])dnl ])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 Do NOT use in any other module.
dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde dnl It only looks at --prefix, TDEDIR and falls back to /usr/local/kde
AC_DEFUN([KDE_SET_PREFIX_CORE], AC_DEFUN([KDE_SET_PREFIX_CORE],
[ [
unset CDPATH unset CDPATH
dnl make $KDEDIR the default for the installation dnl make $TDEDIR the default for the installation
AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
if test "x$prefix" = "xNONE"; then if test "x$prefix" = "xNONE"; then
prefix=$ac_default_prefix prefix=$ac_default_prefix
@ -4756,25 +4756,25 @@ AC_DEFUN([KDE_SET_PREFIX],
unset CDPATH unset CDPATH
dnl We can't give real code to that macro, only a value. dnl We can't give real code to that macro, only a value.
dnl It only matters for --help, since we set the prefix in this function anyway. dnl It only matters for --help, since we set the prefix in this function anyway.
AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix}) AC_PREFIX_DEFAULT(${TDEDIR:-the kde prefix})
KDE_SET_DEFAULT_BINDIRS KDE_SET_DEFAULT_BINDIRS
if test "x$prefix" = "xNONE"; then if test "x$prefix" = "xNONE"; then
dnl no prefix given: look for kde-config in the PATH and deduce the prefix from it dnl no prefix given: look for tde-config in the PATH and deduce the prefix from it
KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend) KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend)
else else
dnl prefix given: look for kde-config, preferrably in prefix, otherwise in PATH dnl prefix given: look for tde-config, preferrably in prefix, otherwise in PATH
kde_save_PATH="$PATH" kde_save_PATH="$PATH"
PATH="$exec_prefix/bin:$prefix/bin:$PATH" PATH="$exec_prefix/bin:$prefix/bin:$PATH"
KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend) KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend)
PATH="$kde_save_PATH" PATH="$kde_save_PATH"
fi fi
kde_libs_prefix=`$KDECONFIG --prefix` kde_libs_prefix=`$KDECONFIG --prefix`
if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then 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 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 fi
kde_libs_htmldir=`$KDECONFIG --install html --expandvars` kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
@ -4783,7 +4783,7 @@ AC_DEFUN([KDE_SET_PREFIX],
AC_MSG_CHECKING([where to install]) AC_MSG_CHECKING([where to install])
if test "x$prefix" = "xNONE"; then if test "x$prefix" = "xNONE"; then
prefix=$kde_libs_prefix prefix=$kde_libs_prefix
AC_MSG_RESULT([$prefix (as returned by kde-config)]) AC_MSG_RESULT([$prefix (as returned by tde-config)])
else else
dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different
given_prefix=$prefix given_prefix=$prefix
@ -5440,7 +5440,7 @@ ssl_includes=""
AC_ARG_WITH(ssl-dir, AC_ARG_WITH(ssl-dir,
AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]), AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]),
[ ac_ssl_includes="$withval"/include [ ac_ssl_includes="$withval"/include
ac_ssl_libraries="$withval"/lib$kdelibsuff ac_ssl_libraries="$withval"/lib$tdelibsuff
]) ])
want_ssl=yes want_ssl=yes
@ -5460,7 +5460,7 @@ AC_CACHE_VAL(ac_cv_have_ssl,
AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir) AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir)
ac_ssl_includes="$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 if test ! "$ac_ssl_libraries" = "NO"; then
ssl_libdirs="$ac_ssl_libraries $ssl_libdirs" ssl_libdirs="$ac_ssl_libraries $ssl_libdirs"
fi fi

262
admin/acinclude.m4.in
Unescape View File

@ -23,8 +23,8 @@ dnl IMPORTANT NOTE:
dnl Please do not modify this file unless you expect your modifications to be dnl Please do not modify this file unless you expect your modifications to be
dnl carried into every other module in the repository. dnl carried into every other module in the repository.
dnl dnl
dnl Single-module modifications are best placed in configure.in for kdelibs dnl Single-module modifications are best placed in configure.in for tdelibs
dnl and kdebase or configure.in.in if present. dnl and tdebase or configure.in.in if present.
# KDE_PATH_X_DIRECT # KDE_PATH_X_DIRECT
dnl Internal subroutine of AC_PATH_X. dnl Internal subroutine of AC_PATH_X.
@ -103,41 +103,41 @@ ac_x_libraries=],
[LIBS="$ac_save_LIBS" [LIBS="$ac_save_LIBS"
# First see if replacing the include by lib works. # First see if replacing the include by lib works.
# Check X11 before X11Rn because it is often a symlink to the current release. # 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}/` \ for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \
/usr/X11/lib${kdelibsuff} \ /usr/X11/lib${tdelibsuff} \
/usr/X11R6/lib${kdelibsuff} \ /usr/X11R6/lib${tdelibsuff} \
/usr/X11R5/lib${kdelibsuff} \ /usr/X11R5/lib${tdelibsuff} \
/usr/X11R4/lib${kdelibsuff} \ /usr/X11R4/lib${tdelibsuff} \
\ \
/usr/lib${kdelibsuff}/X11 \ /usr/lib${tdelibsuff}/X11 \
/usr/lib${kdelibsuff}/X11R6 \ /usr/lib${tdelibsuff}/X11R6 \
/usr/lib${kdelibsuff}/X11R5 \ /usr/lib${tdelibsuff}/X11R5 \
/usr/lib${kdelibsuff}/X11R4 \ /usr/lib${tdelibsuff}/X11R4 \
\ \
/usr/local/X11/lib${kdelibsuff} \ /usr/local/X11/lib${tdelibsuff} \
/usr/local/X11R6/lib${kdelibsuff} \ /usr/local/X11R6/lib${tdelibsuff} \
/usr/local/X11R5/lib${kdelibsuff} \ /usr/local/X11R5/lib${tdelibsuff} \
/usr/local/X11R4/lib${kdelibsuff} \ /usr/local/X11R4/lib${tdelibsuff} \
\ \
/usr/local/lib${kdelibsuff}/X11 \ /usr/local/lib${tdelibsuff}/X11 \
/usr/local/lib${kdelibsuff}/X11R6 \ /usr/local/lib${tdelibsuff}/X11R6 \
/usr/local/lib${kdelibsuff}/X11R5 \ /usr/local/lib${tdelibsuff}/X11R5 \
/usr/local/lib${kdelibsuff}/X11R4 \ /usr/local/lib${tdelibsuff}/X11R4 \
\ \
/usr/X386/lib${kdelibsuff} \ /usr/X386/lib${tdelibsuff} \
/usr/x386/lib${kdelibsuff} \ /usr/x386/lib${tdelibsuff} \
/usr/XFree86/lib${kdelibsuff}/X11 \ /usr/XFree86/lib${tdelibsuff}/X11 \
\ \
/usr/lib${kdelibsuff} \ /usr/lib${tdelibsuff} \
/usr/local/lib${kdelibsuff} \ /usr/local/lib${tdelibsuff} \
/usr/unsupported/lib${kdelibsuff} \ /usr/unsupported/lib${tdelibsuff} \
/usr/athena/lib${kdelibsuff} \ /usr/athena/lib${tdelibsuff} \
/usr/local/x11r5/lib${kdelibsuff} \ /usr/local/x11r5/lib${tdelibsuff} \
/usr/lpp/Xamples/lib${kdelibsuff} \ /usr/lpp/Xamples/lib${tdelibsuff} \
/lib/usr/lib${kdelibsuff}/X11 \ /lib/usr/lib${tdelibsuff}/X11 \
\ \
/usr/openwin/lib${kdelibsuff} \ /usr/openwin/lib${tdelibsuff} \
/usr/openwin/share/lib${kdelibsuff} \ /usr/openwin/share/lib${tdelibsuff} \
; \ ; \
do do
dnl Don't even attempt the hair of trying to link an X program! dnl Don't even attempt the hair of trying to link an X program!
@ -371,24 +371,24 @@ AC_DEFUN([KDE_1_CHECK_PATHS],
fi fi
AC_MSG_CHECKING([for KDE libraries installed]) AC_MSG_CHECKING([for KDE libraries installed])
ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5' ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5'
if AC_TRY_EVAL(ac_link) && test -s conftest; then if AC_TRY_EVAL(ac_link) && test -s conftest; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
else else
AC_MSG_ERROR([your system fails at linking a small KDE application! 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 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.]) For more details about this problem, look at the end of config.log.])
fi fi
if eval `KDEDIR= ./conftest 2>&5`; then if eval `TDEDIR= ./conftest 2>&5`; then
kde_result=done kde_result=done
else else
kde_result=problems kde_result=problems
fi fi
KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
kde_have_all_paths=yes kde_have_all_paths=yes
KDE_SET_PATHS($kde_result) KDE_SET_PATHS($kde_result)
@ -547,11 +547,11 @@ Please check whether you installed aRts correctly or use
AC_DEFUN([KDE_SET_DEFAULT_BINDIRS], AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
[ [
kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin" kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs" test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
if test -n "$KDEDIRS"; then if test -n "$TDEDIRS"; then
kde_save_IFS=$IFS kde_save_IFS=$IFS
IFS=: IFS=:
for dir in $KDEDIRS; do for dir in $TDEDIRS; do
kde_default_bindirs="$dir/bin $kde_default_bindirs " kde_default_bindirs="$dir/bin $kde_default_bindirs "
done done
IFS=$kde_save_IFS IFS=$kde_save_IFS
@ -597,18 +597,18 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi fi
if test -n "$kde32ornewer"; then 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)]) KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
fi fi
if test -n "$kde33ornewer"; then if test -n "$kde33ornewer"; then
KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)]) KDE_FIND_PATH(maketdewidgets, MAKETDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(maketdewidgets)])
AC_SUBST(MAKEKDEWIDGETS) AC_SUBST(MAKETDEWIDGETS)
fi fi
KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""]) KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then
kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share" kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs" test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs"
AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET) AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
if test "$KDE_XSL_STYLESHEET" = "NO"; then if test "$KDE_XSL_STYLESHEET" = "NO"; then
KDE_XSL_STYLESHEET="" KDE_XSL_STYLESHEET=""
@ -705,7 +705,7 @@ AC_SUBST(kde_templatesdir)
AC_SUBST(kde_servicesdir) AC_SUBST(kde_servicesdir)
AC_SUBST(kde_servicetypesdir) AC_SUBST(kde_servicetypesdir)
AC_SUBST(kde_moduledir) AC_SUBST(kde_moduledir)
AC_SUBST(kdeinitdir, '$(kde_moduledir)') AC_SUBST(tdeinitdir, '$(kde_moduledir)')
AC_SUBST(kde_styledir) AC_SUBST(kde_styledir)
AC_SUBST(kde_widgetdir) AC_SUBST(kde_widgetdir)
if test "$kde_qtver" = 1; then if test "$kde_qtver" = 1; then
@ -931,7 +931,7 @@ mips-sgi-irix6*)
ac_x_includes="." ac_x_includes="."
fi fi
if test -z "$ac_x_libraries"; then if test -z "$ac_x_libraries"; then
ac_x_libraries="/usr/lib${kdelibsuff}" ac_x_libraries="/usr/lib${tdelibsuff}"
fi fi
esac esac
#from now on we use our own again #from now on we use our own again
@ -1419,7 +1419,7 @@ qt_includes=""
AC_ARG_WITH(qt-dir, AC_ARG_WITH(qt-dir,
AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]), AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]),
[ ac_qt_includes="$withval"/include [ ac_qt_includes="$withval"/include
ac_qt_libraries="$withval"/lib${kdelibsuff} ac_qt_libraries="$withval"/lib${tdelibsuff}
ac_qt_bindir="$withval"/bin ac_qt_bindir="$withval"/bin
]) ])
@ -1460,7 +1460,7 @@ ac_qt_includes="$qt_incdir"
qt_libdirs="" qt_libdirs=""
for dir in $kde_qt_dirs; do for dir in $kde_qt_dirs; do
qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir" qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir"
done done
qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
if test ! "$ac_qt_libraries" = "NO"; then if test ! "$ac_qt_libraries" = "NO"; then
@ -1645,11 +1645,11 @@ rm -f actest.ui actest.cpp
AC_MSG_RESULT([$kde_cv_uic_plugins]) AC_MSG_RESULT([$kde_cv_uic_plugins])
if test "$kde_cv_uic_plugins" != yes; then if test "$kde_cv_uic_plugins" != yes; then
AC_MSG_ERROR([ 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 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 kdelibs. this configure is not the same version you used to compile tdelibs.
The Qt Plugin installed by kdelibs is *ONLY* loadable if its the The Qt Plugin installed by tdelibs is *ONLY* loadable if its the
same Qt version, compiled with the same compiler and the same Qt same Qt version, compiled with the same compiler and the same Qt
configuration settings. configuration settings.
]) ])
@ -1786,16 +1786,16 @@ AC_CACHE_VAL(ac_cv_have_kde,
if test "$kde_qtver" = 1; then if test "$kde_qtver" = 1; then
kde_check_header="ksock.h" kde_check_header="ksock.h"
kde_check_lib="libkdecore.la" kde_check_lib="libtdecore.la"
else else
kde_check_header="ksharedptr.h" kde_check_header="ksharedptr.h"
kde_check_lib="libkio.la" kde_check_lib="libtdeio.la"
fi fi
if test -z "$1"; then if test -z "$1"; then
kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs" test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs"
kde_incdirs="$ac_kde_includes $kde_incdirs" kde_incdirs="$ac_kde_includes $kde_incdirs"
AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir) AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
ac_kde_includes="$kde_incdir" ac_kde_includes="$kde_incdir"
@ -1806,15 +1806,15 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail.
So, check this please and use another prefix!]) So, check this please and use another prefix!])
fi 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}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" 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}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}"
test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs" test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs"
kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir) AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
ac_kde_libraries="$kde_libdir" ac_kde_libraries="$kde_libdir"
kde_widgetdir=NO kde_widgetdir=NO
dnl this might be somewhere else dnl this might be somewhere else
AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir) AC_FIND_FILE("kde3/plugins/designer/tdewidgets.la", $kde_libdirs, kde_widgetdir)
if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
AC_MSG_ERROR([ AC_MSG_ERROR([
@ -1822,10 +1822,10 @@ in the prefix, you've chosen, are no KDE libraries installed. This will fail.
So, check this please and use another prefix!]) So, check this please and use another prefix!])
fi fi
if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/tdewidgets.la"; then
AC_MSG_ERROR([ AC_MSG_ERROR([
I can't find the designer plugins. These are required and should have been installed I can't find the designer plugins. These are required and should have been installed
by kdelibs]) by tdelibs])
fi fi
if test -n "$kde_widgetdir"; then if test -n "$kde_widgetdir"; then
@ -1840,7 +1840,7 @@ else
ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries" ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
fi 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" ac_cv_have_kde="have_kde=no"
@ -1980,20 +1980,20 @@ cat > conftest.$ac_ext <<EOF
#include <kapp.h> #include <kapp.h>
int main() { int main() {
printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data()); printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data()); printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data()); printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data()); printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data()); printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data()); printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data()); printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data()); printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data()); printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data()); printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
printf("kde_wallpaperdir=\\"%s\\"\n", printf("kde_wallpaperdir=\\"%s\\"\n",
KApplication::kde_wallpaperdir().data()); TDEApplication::kde_wallpaperdir().data());
printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data()); printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data()); printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
printf("kde_servicesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
printf("kde_moduledir=\\"/tmp/dummy\\"\n"); printf("kde_moduledir=\\"/tmp/dummy\\"\n");
@ -2031,7 +2031,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
kde_cxxflags_safe="$CXXFLAGS" kde_cxxflags_safe="$CXXFLAGS"
LIBS="-lkde-qt-addon $LIBQT $LIBS" LIBS="-lkde-qt-addon $LIBQT $LIBS"
CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes" CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes"
LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS" LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
AC_TRY_LINK([ AC_TRY_LINK([
@ -2064,43 +2064,43 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
AC_REQUIRE([K_PATH_X]) AC_REQUIRE([K_PATH_X])
if test $kde_qtver = 3; then if test $kde_qtver = 3; then
AC_SUBST(LIB_KDECORE, "-lkdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_KDEUI, "-lkdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lkabc") AC_SUBST(LIB_KABC, "-ltdeabc")
AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_KDEPRINT, "-lkdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-lkutils") AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
AC_SUBST(LIB_KDEPIM, "-lkdepim") AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-lkimproxy") AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-lkdnssd") AC_SUBST(LIB_TDEDNSSD, "-ltdednssd")
# these are for backward compatibility # these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-lkio") AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
AC_SUBST(LIB_KFILE, "-lkio") AC_SUBST(LIB_KFILE, "-ltdeio")
elif test $kde_qtver = 2; then elif test $kde_qtver = 2; then
AC_SUBST(LIB_KDECORE, "-lkdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_KDEUI, "-lkdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_KSYCOCA, "-lksycoca") AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-lkfile") AC_SUBST(LIB_KFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_KDEPRINT, "-lkdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else else
AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)") AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
fi fi
]) ])
@ -2165,7 +2165,7 @@ if test "x$kde_cv_func_$1" = xyes; then
else else
case "$1" in case "$1" in
setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat) setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
kde_cv_proto_$1="yes - in libkdefakes" kde_cv_proto_$1="yes - in libtdefakes"
;; ;;
*) *)
kde_cv_proto_$1=unknown kde_cv_proto_$1=unknown
@ -2484,7 +2484,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif]) AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
else else
AC_MSG_ERROR(You need giflib30. Please install the kdesupport package) AC_MSG_ERROR(You need giflib30. Please install the tdesupport package)
fi fi
]) ])
@ -2548,7 +2548,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
test "x$jpeg_incdir" = xNO && jpeg_incdir= test "x$jpeg_incdir" = xNO && jpeg_incdir=
dnl if headers _and_ libraries are missing, this is no error, and we dnl if headers _and_ libraries are missing, this is no error, and we
dnl continue with a warning (the user will get no jpeg support in khtml) dnl continue with a warning (the user will get no jpeg support in tdehtml)
dnl if only one is missing, it means a configuration error, but we still dnl if only one is missing, it means a configuration error, but we still
dnl only warn dnl only warn
if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@ -3290,29 +3290,29 @@ AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch config
AC_DEFUN([KDE_CHECK_LIB64], AC_DEFUN([KDE_CHECK_LIB64],
[ [
kdelibsuff="$kde_libs_suffix" tdelibsuff="$kde_libs_suffix"
if test -z "$kdelibsuff"; then if test -z "$tdelibsuff"; then
kdelibsuff=no tdelibsuff=no
fi fi
AC_ARG_ENABLE(libsuffix, AC_ARG_ENABLE(libsuffix,
AC_HELP_STRING([--enable-libsuffix], AC_HELP_STRING([--enable-libsuffix],
[/lib directory suffix (64,32,none[=default])]), [/lib directory suffix (64,32,none[=default])]),
kdelibsuff=$enableval) tdelibsuff=$enableval)
# TODO: add an auto case that compiles a little C app to check # TODO: add an auto case that compiles a little C app to check
# where the glibc is # where the glibc is
if test "$kdelibsuff" = "no"; then if test "$tdelibsuff" = "no"; then
kdelibsuff= tdelibsuff=
fi fi
if test -z "$kdelibsuff"; then if test -z "$tdelibsuff"; then
AC_MSG_RESULT([not using lib directory suffix]) AC_MSG_RESULT([not using lib directory suffix])
AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories) AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories)
else else
if test "$libdir" = '${exec_prefix}/lib'; then if test "$libdir" = '${exec_prefix}/lib'; then
libdir="$libdir${kdelibsuff}" libdir="$libdir${tdelibsuff}"
AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms
fi fi
AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${kdelibsuff}"], Suffix for lib directories) AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${tdelibsuff}"], Suffix for lib directories)
AC_MSG_RESULT([using lib directory suffix $kdelibsuff]) AC_MSG_RESULT([using lib directory suffix $tdelibsuff])
fi fi
]) ])
@ -3330,7 +3330,7 @@ AC_CANONICAL_SYSTEM
AC_ARG_PROGRAM AC_ARG_PROGRAM
AM_INIT_AUTOMAKE($1, $2) AM_INIT_AUTOMAKE($1, $2)
AM_DISABLE_LIBRARIES AM_DISABLE_LIBRARIES
AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
AC_CHECK_COMPILERS AC_CHECK_COMPILERS
KDE_PROG_LIBTOOL KDE_PROG_LIBTOOL
AM_KDE_WITH_NLS AM_KDE_WITH_NLS
@ -4336,7 +4336,7 @@ fi
PYTHONINC=-I$python_incdir 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) AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir)
if test ! -r $python_libdir/libpython$version.so; then if test ! -r $python_libdir/libpython$version.so; then
AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir) AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)
@ -4724,14 +4724,14 @@ AC_DEFUN([KDE_CONF_FILES],
AC_SUBST(CONF_FILES) AC_SUBST(CONF_FILES)
])dnl ])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 Do NOT use in any other module.
dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde dnl It only looks at --prefix, TDEDIR and falls back to /usr/local/kde
AC_DEFUN([KDE_SET_PREFIX_CORE], AC_DEFUN([KDE_SET_PREFIX_CORE],
[ [
unset CDPATH unset CDPATH
dnl make $KDEDIR the default for the installation dnl make $TDEDIR the default for the installation
AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
if test "x$prefix" = "xNONE"; then if test "x$prefix" = "xNONE"; then
prefix=$ac_default_prefix prefix=$ac_default_prefix
@ -4756,25 +4756,25 @@ AC_DEFUN([KDE_SET_PREFIX],
unset CDPATH unset CDPATH
dnl We can't give real code to that macro, only a value. dnl We can't give real code to that macro, only a value.
dnl It only matters for --help, since we set the prefix in this function anyway. dnl It only matters for --help, since we set the prefix in this function anyway.
AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix}) AC_PREFIX_DEFAULT(${TDEDIR:-the kde prefix})
KDE_SET_DEFAULT_BINDIRS KDE_SET_DEFAULT_BINDIRS
if test "x$prefix" = "xNONE"; then if test "x$prefix" = "xNONE"; then
dnl no prefix given: look for kde-config in the PATH and deduce the prefix from it dnl no prefix given: look for tde-config in the PATH and deduce the prefix from it
KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend) KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend)
else else
dnl prefix given: look for kde-config, preferrably in prefix, otherwise in PATH dnl prefix given: look for tde-config, preferrably in prefix, otherwise in PATH
kde_save_PATH="$PATH" kde_save_PATH="$PATH"
PATH="$exec_prefix/bin:$prefix/bin:$PATH" PATH="$exec_prefix/bin:$prefix/bin:$PATH"
KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend) KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend)
PATH="$kde_save_PATH" PATH="$kde_save_PATH"
fi fi
kde_libs_prefix=`$KDECONFIG --prefix` kde_libs_prefix=`$KDECONFIG --prefix`
if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then 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 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 fi
kde_libs_htmldir=`$KDECONFIG --install html --expandvars` kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
@ -4783,7 +4783,7 @@ AC_DEFUN([KDE_SET_PREFIX],
AC_MSG_CHECKING([where to install]) AC_MSG_CHECKING([where to install])
if test "x$prefix" = "xNONE"; then if test "x$prefix" = "xNONE"; then
prefix=$kde_libs_prefix prefix=$kde_libs_prefix
AC_MSG_RESULT([$prefix (as returned by kde-config)]) AC_MSG_RESULT([$prefix (as returned by tde-config)])
else else
dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different
given_prefix=$prefix given_prefix=$prefix
@ -5440,7 +5440,7 @@ ssl_includes=""
AC_ARG_WITH(ssl-dir, AC_ARG_WITH(ssl-dir,
AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]), AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]),
[ ac_ssl_includes="$withval"/include [ ac_ssl_includes="$withval"/include
ac_ssl_libraries="$withval"/lib$kdelibsuff ac_ssl_libraries="$withval"/lib$tdelibsuff
]) ])
want_ssl=yes want_ssl=yes
@ -5460,7 +5460,7 @@ AC_CACHE_VAL(ac_cv_have_ssl,
AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir) AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir)
ac_ssl_includes="$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 if test ! "$ac_ssl_libraries" = "NO"; then
ssl_libdirs="$ac_ssl_libraries $ssl_libdirs" ssl_libdirs="$ac_ssl_libraries $ssl_libdirs"
fi fi

148
admin/am_edit
Unescape View File

@ -68,7 +68,7 @@ sub tag_CLOSURE();
sub tag_NO_UNDEFINED(); sub tag_NO_UNDEFINED();
sub tag_NMCHECK(); sub tag_NMCHECK();
sub tag_DIST(); sub tag_DIST();
sub tag_KDEINIT(); sub tag_TDEINIT();
# Some global globals... # Some global globals...
$verbose = 0; # a debug flag $verbose = 0; # a debug flag
@ -215,7 +215,7 @@ sub processMakefile ($)
local @programs = (); # lists the names of programs and libraries local @programs = (); # lists the names of programs and libraries
local $program = ""; local $program = "";
local @kdeinits = (); # lists the kdeinit targets local @tdeinits = (); # lists the tdeinit targets
local %realObjs = (); # lists the objects compiled into $program local %realObjs = (); # lists the objects compiled into $program
local %sources = (); # lists the sources used for $program local %sources = (); # lists the sources used for $program
@ -274,11 +274,11 @@ sub processMakefile ($)
if ($sources_changed{$program}) { if ($sources_changed{$program}) {
my $lookup = $program . '_SOURCES\s*=[ \t]*(.*)'; my $lookup = $program . '_SOURCES\s*=[ \t]*(.*)';
if($program =~ /libkdeinit_(.*)/) { if($program =~ /libtdeinit_(.*)/) {
my $prog = $1; my $prog = $1;
substituteLine($prog . '_SOURCES\s*=[ \t]*(.*)', substituteLine($prog . '_SOURCES\s*=[ \t]*(.*)',
"${prog}_SOURCES = ${prog}_dummy.$cxxsuffix\n" . "${prog}_SOURCES = ${prog}_dummy.$cxxsuffix\n" .
"libkdeinit_${prog}_SOURCES = " . $sources{$program}); "libtdeinit_${prog}_SOURCES = " . $sources{$program});
$sources{$prog} = "${prog}_dummy.$cxxsuffix"; $sources{$prog} = "${prog}_dummy.$cxxsuffix";
} }
else { else {
@ -618,7 +618,7 @@ sub initialise ()
} }
} }
tag_KDEINIT(); tag_TDEINIT();
while ($MakefileData =~ /\n(\S*)_OBJECTS\s*=[\034 \t]*([^\n]*)\n/g) { while ($MakefileData =~ /\n(\S*)_OBJECTS\s*=[\034 \t]*([^\n]*)\n/g) {
@ -642,7 +642,7 @@ sub initialise ()
} }
next if ($ocv); next if ($ocv);
next if ($program =~ /^am_libkdeinit_/); next if ($program =~ /^am_libtdeinit_/);
$program =~ s/^am_// if ($program =~ /^am_/); $program =~ s/^am_// if ($program =~ /^am_/);
@ -857,147 +857,147 @@ sub tag_FINAL()
} }
} }
sub tag_KDEINIT() sub tag_TDEINIT()
{ {
my @progs = (); my @progs = ();
my $ltlibs = ""; my $ltlibs = "";
my $lookup = 'kdeinit_LTLIBRARIES\s*=[ \t]*(.*)'; my $lookup = 'tdeinit_LTLIBRARIES\s*=[ \t]*(.*)';
if ($MakefileData =~ m/\n$lookup/) { if ($MakefileData =~ m/\n$lookup/) {
@kdeinits = split(/[\034\s]+/, $1); @tdeinits = split(/[\034\s]+/, $1);
my $lines = ""; my $lines = "";
foreach my $kdeinit (@kdeinits) { foreach my $tdeinit (@tdeinits) {
if ($kdeinit =~ m/\.la$/) { if ($tdeinit =~ m/\.la$/) {
$kdeinit =~ s/\.la$//; $tdeinit =~ s/\.la$//;
push(@progs, $kdeinit); push(@progs, $tdeinit);
$lines .= "\n${kdeinit}.la.$cxxsuffix:\n"; $lines .= "\n${tdeinit}.la.$cxxsuffix:\n";
$lines .= "\techo 'extern \"C\" int kdemain(int argc, char* argv[]);' > ${kdeinit}.la.$cxxsuffix; \\\n"; $lines .= "\techo 'extern \"C\" int kdemain(int argc, char* argv[]);' > ${tdeinit}.la.$cxxsuffix; \\\n";
$lines .= "\techo 'int main(int argc, char* argv[]) { return kdemain(argc,argv); }' >> ${kdeinit}.la.$cxxsuffix\n"; $lines .= "\techo 'int main(int argc, char* argv[]) { return kdemain(argc,argv); }' >> ${tdeinit}.la.$cxxsuffix\n";
$lines .= "\n${kdeinit}_dummy.$cxxsuffix:\n"; $lines .= "\n${tdeinit}_dummy.$cxxsuffix:\n";
$lines .= "\techo 'extern \"C\" int kdemain(int argc, char* argv[]);' > ${kdeinit}_dummy.$cxxsuffix; \\\n"; $lines .= "\techo 'extern \"C\" int kdemain(int argc, char* argv[]);' > ${tdeinit}_dummy.$cxxsuffix; \\\n";
$lines .= "\techo 'extern \"C\" int kdeinitmain(int argc, char* argv[]) { return kdemain(argc,argv); }' >> ${kdeinit}_dummy.$cxxsuffix\n"; $lines .= "\techo 'extern \"C\" int tdeinitmain(int argc, char* argv[]) { return kdemain(argc,argv); }' >> ${tdeinit}_dummy.$cxxsuffix\n";
push(@cleanfiles, "${kdeinit}.la.$cxxsuffix"); push(@cleanfiles, "${tdeinit}.la.$cxxsuffix");
push(@cleanfiles, "${kdeinit}_dummy.$cxxsuffix"); push(@cleanfiles, "${tdeinit}_dummy.$cxxsuffix");
# add dependency # add dependency
$dep_files .= " \$(DEPDIR)/${kdeinit}.la.Po" if($dep_files !~/${kdeinit}.la.Po/ ); $dep_files .= " \$(DEPDIR)/${tdeinit}.la.Po" if($dep_files !~/${tdeinit}.la.Po/ );
$dep_files .= " \$(DEPDIR)/${kdeinit}_dummy.Plo" if($dep_files !~/${kdeinit}_dummy.Plo/ ); $dep_files .= " \$(DEPDIR)/${tdeinit}_dummy.Plo" if($dep_files !~/${tdeinit}_dummy.Plo/ );
# make library # make library
$lookup = $kdeinit . '_la_LIBADD\s*=[ \t]*(.*)'; $lookup = $tdeinit . '_la_LIBADD\s*=[ \t]*(.*)';
if($MakefileData =~ m/\n$lookup/) { if($MakefileData =~ m/\n$lookup/) {
my $libadd = $1; my $libadd = $1;
substituteLine($lookup, "${kdeinit}_la_LIBADD = libkdeinit_${kdeinit}.la"); substituteLine($lookup, "${tdeinit}_la_LIBADD = libtdeinit_${tdeinit}.la");
appendLines("libkdeinit_${kdeinit}_la_LIBADD = $libadd\n"); appendLines("libtdeinit_${tdeinit}_la_LIBADD = $libadd\n");
} }
appendLines("libkdeinit_${kdeinit}_la_LDFLAGS = -no-undefined -avoid-version \$(all_libraries)\n"); appendLines("libtdeinit_${tdeinit}_la_LDFLAGS = -no-undefined -avoid-version \$(all_libraries)\n");
# add library dependencies # add library dependencies
$lookup = $kdeinit . '_la_DEPENDENCIES\s*=[ \t]*(.*)'; $lookup = $tdeinit . '_la_DEPENDENCIES\s*=[ \t]*(.*)';
if($MakefileData =~ m/\n$lookup/) { if($MakefileData =~ m/\n$lookup/) {
my $libdeps = $1; my $libdeps = $1;
substituteLine($lookup, "${kdeinit}_la_DEPENDENCIES = libkdeinit_${kdeinit}.la"); substituteLine($lookup, "${tdeinit}_la_DEPENDENCIES = libtdeinit_${tdeinit}.la");
appendLines("libkdeinit_${kdeinit}_la_DEPENDENCIES = $libdeps\n"); appendLines("libtdeinit_${tdeinit}_la_DEPENDENCIES = $libdeps\n");
} }
# make library objects # make library objects
$lookup = "am_${kdeinit}_la_OBJECTS" . '\s*=[ \t]*(.*)'; $lookup = "am_${tdeinit}_la_OBJECTS" . '\s*=[ \t]*(.*)';
if($MakefileData =~ m/\n$lookup/) { if($MakefileData =~ m/\n$lookup/) {
my $libobjects = $1; my $libobjects = $1;
substituteLine($lookup, "am_${kdeinit}_la_OBJECTS = ${kdeinit}_dummy.lo"); substituteLine($lookup, "am_${tdeinit}_la_OBJECTS = ${tdeinit}_dummy.lo");
appendLines("am_libkdeinit_${kdeinit}_la_OBJECTS = $libobjects\n"); appendLines("am_libtdeinit_${tdeinit}_la_OBJECTS = $libobjects\n");
my $prog = "libkdeinit_${kdeinit}_la"; my $prog = "libtdeinit_${tdeinit}_la";
push(@programs, $prog); push(@programs, $prog);
$realObjs{$prog} = $libobjects; $realObjs{$prog} = $libobjects;
$realname{$prog} = "libkdeinit_${kdeinit}.la"; $realname{$prog} = "libtdeinit_${tdeinit}.la";
} }
$target_adds{"libkdeinit_${kdeinit}.la"} = "\$(libkdeinit_${kdeinit}_la_OBJECTS) \$(libkdeinit_${kdeinit}_la_DEPENDENCIES)\n" . $target_adds{"libtdeinit_${tdeinit}.la"} = "\$(libtdeinit_${tdeinit}_la_OBJECTS) \$(libtdeinit_${tdeinit}_la_DEPENDENCIES)\n" .
"\t\$(CXXLINK) -rpath \$(libdir) \$(libkdeinit_${kdeinit}_la_LDFLAGS) ". "\t\$(CXXLINK) -rpath \$(libdir) \$(libtdeinit_${tdeinit}_la_LDFLAGS) ".
"\$(libkdeinit_${kdeinit}_la_OBJECTS) " . "\$(libtdeinit_${tdeinit}_la_OBJECTS) " .
"\$(libkdeinit_${kdeinit}_la_LIBADD) " . "\$(libtdeinit_${tdeinit}_la_LIBADD) " .
"\$(LIBS)\n"; "\$(LIBS)\n";
# make libkdeinit sources # make libtdeinit sources
$lookup = $kdeinit . '_la_SOURCES\s*=[ \t]*(.*)'; $lookup = $tdeinit . '_la_SOURCES\s*=[ \t]*(.*)';
if($MakefileData =~ m/\n$lookup/) { if($MakefileData =~ m/\n$lookup/) {
my $srces = $1; my $srces = $1;
$sources_changed{"libkdeinit_${kdeinit}_la"} = 1; $sources_changed{"libtdeinit_${tdeinit}_la"} = 1;
$sources{"libkdeinit_${kdeinit}_la"} = $srces; $sources{"libtdeinit_${tdeinit}_la"} = $srces;
} }
# make libkdeinit metasources # make libtdeinit metasources
$lookup = $kdeinit . '_la_METASOURCES\s*=[ \t]*(.*)'; $lookup = $tdeinit . '_la_METASOURCES\s*=[ \t]*(.*)';
substituteLine($lookup, "libkdeinit_${kdeinit}_la_METASOURCES = $1") substituteLine($lookup, "libtdeinit_${tdeinit}_la_METASOURCES = $1")
if($MakefileData =~ m/\n$lookup/); if($MakefileData =~ m/\n$lookup/);
=cut =cut
# make binary sources # make binary sources
$lookup = $kdeinit. '_SOURCES\s*=[ \t]*(.*)'; $lookup = $tdeinit. '_SOURCES\s*=[ \t]*(.*)';
if($MakefileData =~ m/\n$lookup/) { if($MakefileData =~ m/\n$lookup/) {
substituteLine($lookup, "${kdeinit}_SOURCES = ${kdeinit}.la.$cxxsuffix"); substituteLine($lookup, "${tdeinit}_SOURCES = ${tdeinit}.la.$cxxsuffix");
$lookup = 'SOURCES\s*=[ \t]*(.*)'; $lookup = 'SOURCES\s*=[ \t]*(.*)';
if($MakefileData =~ m/\n$lookup/) { if($MakefileData =~ m/\n$lookup/) {
my $srces = $1; my $srces = $1;
$srces =~ s/\b$kdeinit\.c\b/\$(${kdeinit}_SOURCES)/; $srces =~ s/\b$tdeinit\.c\b/\$(${tdeinit}_SOURCES)/;
$srces =~ s/\$\(${kdeinit}_la_SOURCES\)/\$(libkdeinit_${kdeinit}_la_SOURCES)/; $srces =~ s/\$\(${tdeinit}_la_SOURCES\)/\$(libtdeinit_${tdeinit}_la_SOURCES)/;
substituteLine($lookup, "SOURCES = $srces"); substituteLine($lookup, "SOURCES = $srces");
} }
$lookup = 'DIST_SOURCES\s*=[ \t](.*)'; $lookup = 'DIST_SOURCES\s*=[ \t](.*)';
if($MakefileData =~ m/\n$lookup/) { if($MakefileData =~ m/\n$lookup/) {
my $srces = $1; my $srces = $1;
$srces =~ s/\b$kdeinit\.c\b/\$(${kdeinit}_SOURCES)/; $srces =~ s/\b$tdeinit\.c\b/\$(${tdeinit}_SOURCES)/;
$srces =~ s/\$\(${kdeinit}_la_SOURCES\)/\$(libkdeinit_${kdeinit}_la_SOURCES)/; $srces =~ s/\$\(${tdeinit}_la_SOURCES\)/\$(libtdeinit_${tdeinit}_la_SOURCES)/;
substituteLine($lookup, "DIST_SOURCES = $srces"); substituteLine($lookup, "DIST_SOURCES = $srces");
} }
} }
# make binary objects / libs # make binary objects / libs
$lookup = $kdeinit . '_OBJECTS\s*=[ \t]*.*'; $lookup = $tdeinit . '_OBJECTS\s*=[ \t]*.*';
if($MakefileData =~ m/\n$lookup/) { if($MakefileData =~ m/\n$lookup/) {
$realObjs{$kdeinit} = "${kdeinit}.la.\$(OBJEXT)"; $realObjs{$tdeinit} = "${tdeinit}.la.\$(OBJEXT)";
substituteLine("${kdeinit}_LDFLAGS\\s*=.*", "${kdeinit}_LDFLAGS = \$(all_libraries)"); substituteLine("${tdeinit}_LDFLAGS\\s*=.*", "${tdeinit}_LDFLAGS = \$(all_libraries)");
substituteLine("${kdeinit}_LDADD\\s*=.*", "${kdeinit}_LDADD = libkdeinit_${kdeinit}.la"); substituteLine("${tdeinit}_LDADD\\s*=.*", "${tdeinit}_LDADD = libtdeinit_${tdeinit}.la");
substituteLine("${kdeinit}_DEPENDENCIES\\s*=.*", "${kdeinit}_DEPENDENCIES = libkdeinit_${kdeinit}.la"); substituteLine("${tdeinit}_DEPENDENCIES\\s*=.*", "${tdeinit}_DEPENDENCIES = libtdeinit_${tdeinit}.la");
} }
=cut =cut
# add binary # add binary
push(@programs, $kdeinit); push(@programs, $tdeinit);
$realObjs{$kdeinit} = "${kdeinit}.la.\$(OBJEXT)"; $realObjs{$tdeinit} = "${tdeinit}.la.\$(OBJEXT)";
$realname{$kdeinit} = $kdeinit; $realname{$tdeinit} = $tdeinit;
$sources{$kdeinit} = "${kdeinit}.la.$cxxsuffix"; $sources{$tdeinit} = "${tdeinit}.la.$cxxsuffix";
$lines .= "${kdeinit}_LDFLAGS = \$(KDE_RPATH) -no-undefined \$(all_libraries)\n"; $lines .= "${tdeinit}_LDFLAGS = \$(KDE_RPATH) -no-undefined \$(all_libraries)\n";
$lines .= "${kdeinit}_LDADD = libkdeinit_${kdeinit}.la\n"; $lines .= "${tdeinit}_LDADD = libtdeinit_${tdeinit}.la\n";
$lines .= "${kdeinit}_DEPENDENCIES = libkdeinit_${kdeinit}.la\n"; $lines .= "${tdeinit}_DEPENDENCIES = libtdeinit_${tdeinit}.la\n";
$target_adds{"${kdeinit}\$(EXEEXT)"} = $target_adds{"${tdeinit}\$(EXEEXT)"} =
"\$(${kdeinit}_OBJECTS) \$(${kdeinit}_DEPENDENCIES)\n" . "\$(${tdeinit}_OBJECTS) \$(${tdeinit}_DEPENDENCIES)\n" .
"\t\@rm -f ${kdeinit}\$(EXEEXT)\n" . "\t\@rm -f ${tdeinit}\$(EXEEXT)\n" .
"\t\$(CXXLINK) \$(${kdeinit}_LDFLAGS) \$(${kdeinit}_OBJECTS) \$(${kdeinit}_LDADD) \$(LIBS)\n"; "\t\$(CXXLINK) \$(${tdeinit}_LDFLAGS) \$(${tdeinit}_OBJECTS) \$(${tdeinit}_LDADD) \$(LIBS)\n";
$ltlibs .= " libkdeinit_${kdeinit}.la"; $ltlibs .= " libtdeinit_${tdeinit}.la";
} }
} }
appendLines($lines); appendLines($lines);
# add libkdeinit target # add libtdeinit target
$lookup = 'lib_LTLIBRARIES\s*=[ \t]*(.*)'; $lookup = 'lib_LTLIBRARIES\s*=[ \t]*(.*)';
if($MakefileData =~ m/\n$lookup/) { if($MakefileData =~ m/\n$lookup/) {
substituteLine($lookup, "lib_LTLIBRARIES = $1 $ltlibs"); substituteLine($lookup, "lib_LTLIBRARIES = $1 $ltlibs");
} }
else { else {
print STDERR print STDERR
"Error: lib_LTLIBRARIES missing in $printname (required for kdeinit_LTLIBRARIES).\n"; "Error: lib_LTLIBRARIES missing in $printname (required for tdeinit_LTLIBRARIES).\n";
$errorflag = 1; $errorflag = 1;
} }
} }
if($#progs >= 0) { if($#progs >= 0) {
if($MakefileData !~ m/\nbin_PROGRAMS\s*=/) { if($MakefileData !~ m/\nbin_PROGRAMS\s*=/) {
print STDERR "Error: bin_PROGRAMS missing in $printname (required for kdeinit_LTLIBRARIES).\n"; print STDERR "Error: bin_PROGRAMS missing in $printname (required for tdeinit_LTLIBRARIES).\n";
$errorflag = 1; $errorflag = 1;
} }
else { else {
@ -1365,7 +1365,7 @@ sub tag_UIFILES ()
$dep_lines .= "\trm -f $source.$cxxsuffix\n"; $dep_lines .= "\trm -f $source.$cxxsuffix\n";
if (!$kdeopts{"qtonly"}) { if (!$kdeopts{"qtonly"}) {
$dep_lines .= "\techo '#include <kdialog.h>' > $source.$cxxsuffix\n"; $dep_lines .= "\techo '#include <kdialog.h>' > $source.$cxxsuffix\n";
$dep_lines .= "\techo '#include <klocale.h>' >> $source.$cxxsuffix\n"; $dep_lines .= "\techo '#include <tdelocale.h>' >> $source.$cxxsuffix\n";
my ($mangled_source) = $source; my ($mangled_source) = $source;
$mangled_source =~ s/[^A-Za-z0-9]/_/g; # get rid of garbage $mangled_source =~ s/[^A-Za-z0-9]/_/g; # get rid of garbage
$dep_lines .= "\t\$(UIC) -tr \${UIC_TR} -i $source.h $sourcedir$source.ui > $source.$cxxsuffix.temp ; ret=\$\$?; \\\n"; $dep_lines .= "\t\$(UIC) -tr \${UIC_TR} -i $source.h $sourcedir$source.ui > $source.$cxxsuffix.temp ; ret=\$\$?; \\\n";
@ -1738,7 +1738,7 @@ sub tag_POFILES ()
$pofiles = join(" ", grep(/\.po$/, readdir(THISDIR))); $pofiles = join(" ", grep(/\.po$/, readdir(THISDIR)));
closedir (THISDIR); closedir (THISDIR);
print STDOUT "pofiles found = $pofiles\n" if ($verbose); print STDOUT "pofiles found = $pofiles\n" if ($verbose);
if (-f "charset" && -f "kdelibs/kdelibs.po") { if (-f "charset" && -f "tdelibs/tdelibs.po") {
handle_TOPLEVEL(); handle_TOPLEVEL();
} }
} }

2
admin/config.pl
Unescape View File

@ -8,7 +8,7 @@
# has to recompile the regexps every time. # has to recompile the regexps every time.
# #
# this script does better. It changes all Makefile.ins in one process. # this script does better. It changes all Makefile.ins in one process.
# in kdelibs the time for building Makefile went down from 2:59 min to 13 sec! # in tdelibs the time for building Makefile went down from 2:59 min to 13 sec!
# #
# written by Michael Matz <matz@kde.org> # written by Michael Matz <matz@kde.org>
# adapted by Dirk Mueller <mueller@kde.org> # adapted by Dirk Mueller <mueller@kde.org>

4
admin/configure.in.bot.end
Unescape View File

@ -3,13 +3,13 @@ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then
# And if so, warn when they don't match # And if so, warn when they don't match
if test "$kde_libs_prefix" != "$given_prefix"; then if test "$kde_libs_prefix" != "$given_prefix"; then
# And if kde doesn't know about the prefix yet # And if kde doesn't know about the prefix yet
echo ":"`kde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null echo ":"`tde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null
if test $? -ne 0; then if test $? -ne 0; then
echo "" echo ""
echo "Warning: you chose to install this package in $given_prefix," echo "Warning: you chose to install this package in $given_prefix,"
echo "but KDE was found in $kde_libs_prefix." echo "but KDE was found in $kde_libs_prefix."
echo "For this to work, you will need to tell KDE about the new prefix, by ensuring" echo "For this to work, you will need to tell KDE about the new prefix, by ensuring"
echo "that KDEDIRS contains it, e.g. export KDEDIRS=$given_prefix:$kde_libs_prefix" echo "that TDEDIRS contains it, e.g. export TDEDIRS=$given_prefix:$kde_libs_prefix"
echo "Then restart KDE." echo "Then restart KDE."
echo "" echo ""
fi fi

4
admin/cvs.sh
Unescape View File

@ -555,13 +555,13 @@ for subdir in $dirs; do
echo "$subdir has *.rc, *.ui or *.kcfg files, but not correct messages line" echo "$subdir has *.rc, *.ui or *.kcfg files, but not correct messages line"
fi fi
fi fi
if find . -name \*.c\* -o -name \*.h\* | xargs fgrep -s -q KAboutData ; then if find . -name \*.c\* -o -name \*.h\* | xargs fgrep -s -q TDEAboutData ; then
echo -e 'i18n("_: NAME OF TRANSLATORS\\n"\n"Your names")\ni18n("_: EMAIL OF TRANSLATORS\\n"\n"Your emails")' > _translatorinfo.cpp echo -e 'i18n("_: NAME OF TRANSLATORS\\n"\n"Your names")\ni18n("_: EMAIL OF TRANSLATORS\\n"\n"Your emails")' > _translatorinfo.cpp
else echo " " > _translatorinfo.cpp else echo " " > _translatorinfo.cpp
fi fi
perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages

2
admin/debianrules
Unescape View File

@ -9,7 +9,7 @@ chomp $origPwd;
$kde_prefix = "/usr"; $kde_prefix = "/usr";
$sysconfdir = "/etc"; $sysconfdir = "/etc";
$kde_includedir = "$kde_prefix/include/kde"; $kde_includedir = "$kde_prefix/include/tde";
$infodir = "$kde_prefix/share/info"; $infodir = "$kde_prefix/share/info";
$mandir = "$kde_prefix/share/man"; $mandir = "$kde_prefix/share/man";
$qtdir = "/usr/share/qt3"; $qtdir = "/usr/share/qt3";

398
configure vendored
Unescape View File

@ -426,7 +426,7 @@ PACKAGE_STRING=
PACKAGE_BUGREPORT= PACKAGE_BUGREPORT=
ac_unique_file="acinclude.m4" ac_unique_file="acinclude.m4"
ac_default_prefix=${KDEDIR:-the kde prefix} ac_default_prefix=${TDEDIR:-the kde prefix}
# Factoring default headers for most tests. # Factoring default headers for most tests.
ac_includes_default="\ ac_includes_default="\
#include <stdio.h> #include <stdio.h>
@ -464,7 +464,7 @@ ac_includes_default="\
# include <unistd.h> # include <unistd.h>
#endif" #endif"
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KSYCOCA LIB_KFILE LIB_KFM TOPSUBDIRS LIBOBJS LTLIBOBJS' ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKETDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir tdeinitdir kde_styledir kde_widgetdir LIB_TDECORE LIB_TDEUI LIB_TDEIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_TDEHTML LIB_TDESPELL LIB_TDEPARTS LIB_TDEPRINT LIB_TDEUTILS LIB_TDEPIM LIB_TDEIMPROXY LIB_KNEWSTUFF LIB_TDEDNSSD LIB_TDESYCOCA LIB_KFILE LIB_KFM TOPSUBDIRS LIBOBJS LTLIBOBJS'
ac_subst_files='' ac_subst_files=''
# Initialize some variables set by options. # Initialize some variables set by options.
@ -2088,11 +2088,11 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin" kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs" test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
if test -n "$KDEDIRS"; then if test -n "$TDEDIRS"; then
kde_save_IFS=$IFS kde_save_IFS=$IFS
IFS=: IFS=:
for dir in $KDEDIRS; do for dir in $TDEDIRS; do
kde_default_bindirs="$dir/bin $kde_default_bindirs " kde_default_bindirs="$dir/bin $kde_default_bindirs "
done done
IFS=$kde_save_IFS IFS=$kde_save_IFS
@ -2100,12 +2100,12 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
if test "x$prefix" = "xNONE"; then if test "x$prefix" = "xNONE"; then
echo "$as_me:$LINENO: checking for kde-config" >&5 echo "$as_me:$LINENO: checking for tde-config" >&5
echo $ECHO_N "checking for kde-config... $ECHO_C" >&6 echo $ECHO_N "checking for tde-config... $ECHO_C" >&6
if test -n "$KDECONFIG"; then if test -n "$KDECONFIG"; then
kde_cv_path="$KDECONFIG"; kde_cv_path="$KDECONFIG";
else else
kde_cache=`echo kde-config | sed 'y%./+-%__p_%'` kde_cache=`echo tde-config | sed 'y%./+-%__p_%'`
if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
@ -2124,16 +2124,16 @@ else
IFS=$kde_save_IFS IFS=$kde_save_IFS
for dir in $dirs; do for dir in $dirs; do
if test -x "$dir/kde-config"; then if test -x "$dir/tde-config"; then
if test -n "" if test -n ""
then then
evalstr="$dir/kde-config 2>&1 " evalstr="$dir/tde-config 2>&1 "
if eval $evalstr; then if eval $evalstr; then
kde_cv_path="$dir/kde-config" kde_cv_path="$dir/tde-config"
break break
fi fi
else else
kde_cv_path="$dir/kde-config" kde_cv_path="$dir/tde-config"
break break
fi fi
fi fi
@ -2153,10 +2153,10 @@ fi
echo "$as_me:$LINENO: result: not found" >&5 echo "$as_me:$LINENO: result: not found" >&5
echo "${ECHO_T}not found" >&6 echo "${ECHO_T}not found" >&6
{ { echo "$as_me:$LINENO: error: The important program kde-config was not found! { { echo "$as_me:$LINENO: error: The important program tde-config was not found!
Please check whether you installed KDE correctly. Please check whether you installed KDE correctly.
" >&5 " >&5
echo "$as_me: error: The important program kde-config was not found! echo "$as_me: error: The important program tde-config was not found!
Please check whether you installed KDE correctly. Please check whether you installed KDE correctly.
" >&2;} " >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
@ -2172,12 +2172,12 @@ echo "${ECHO_T}$kde_cv_path" >&6
kde_save_PATH="$PATH" kde_save_PATH="$PATH"
PATH="$exec_prefix/bin:$prefix/bin:$PATH" PATH="$exec_prefix/bin:$prefix/bin:$PATH"
echo "$as_me:$LINENO: checking for kde-config" >&5 echo "$as_me:$LINENO: checking for tde-config" >&5
echo $ECHO_N "checking for kde-config... $ECHO_C" >&6 echo $ECHO_N "checking for tde-config... $ECHO_C" >&6
if test -n "$KDECONFIG"; then if test -n "$KDECONFIG"; then
kde_cv_path="$KDECONFIG"; kde_cv_path="$KDECONFIG";
else else
kde_cache=`echo kde-config | sed 'y%./+-%__p_%'` kde_cache=`echo tde-config | sed 'y%./+-%__p_%'`
if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
@ -2196,16 +2196,16 @@ else
IFS=$kde_save_IFS IFS=$kde_save_IFS
for dir in $dirs; do for dir in $dirs; do
if test -x "$dir/kde-config"; then if test -x "$dir/tde-config"; then
if test -n "" if test -n ""
then then
evalstr="$dir/kde-config 2>&1 " evalstr="$dir/tde-config 2>&1 "
if eval $evalstr; then if eval $evalstr; then
kde_cv_path="$dir/kde-config" kde_cv_path="$dir/tde-config"
break break
fi fi
else else
kde_cv_path="$dir/kde-config" kde_cv_path="$dir/tde-config"
break break
fi fi
fi fi
@ -2225,10 +2225,10 @@ fi
echo "$as_me:$LINENO: result: not found" >&5 echo "$as_me:$LINENO: result: not found" >&5
echo "${ECHO_T}not found" >&6 echo "${ECHO_T}not found" >&6
{ { echo "$as_me:$LINENO: error: The important program kde-config was not found! { { echo "$as_me:$LINENO: error: The important program tde-config was not found!
Please check whether you installed KDE correctly. Please check whether you installed KDE correctly.
" >&5 " >&5
echo "$as_me: error: The important program kde-config was not found! echo "$as_me: error: The important program tde-config was not found!
Please check whether you installed KDE correctly. Please check whether you installed KDE correctly.
" >&2;} " >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
@ -2245,13 +2245,13 @@ echo "${ECHO_T}$kde_cv_path" >&6
kde_libs_prefix=`$KDECONFIG --prefix` kde_libs_prefix=`$KDECONFIG --prefix`
if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
{ { echo "$as_me:$LINENO: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs. { { echo "$as_me:$LINENO: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs.
This means it has been moved since you installed it. 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.
" >&5 " >&5
echo "$as_me: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs. echo "$as_me: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs.
This means it has been moved since you installed it. 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.
" >&2;} " >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
@ -2262,8 +2262,8 @@ echo "$as_me: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_
echo $ECHO_N "checking where to install... $ECHO_C" >&6 echo $ECHO_N "checking where to install... $ECHO_C" >&6
if test "x$prefix" = "xNONE"; then if test "x$prefix" = "xNONE"; then
prefix=$kde_libs_prefix prefix=$kde_libs_prefix
echo "$as_me:$LINENO: result: $prefix (as returned by kde-config)" >&5 echo "$as_me:$LINENO: result: $prefix (as returned by tde-config)" >&5
echo "${ECHO_T}$prefix (as returned by kde-config)" >&6 echo "${ECHO_T}$prefix (as returned by tde-config)" >&6
else else
given_prefix=$prefix given_prefix=$prefix
echo "$as_me:$LINENO: result: $prefix (as requested)" >&5 echo "$as_me:$LINENO: result: $prefix (as requested)" >&5
@ -6841,21 +6841,21 @@ fi;
kdelibsuff="$kde_libs_suffix" tdelibsuff="$kde_libs_suffix"
if test -z "$kdelibsuff"; then if test -z "$tdelibsuff"; then
kdelibsuff=no tdelibsuff=no
fi fi
# Check whether --enable-libsuffix or --disable-libsuffix was given. # Check whether --enable-libsuffix or --disable-libsuffix was given.
if test "${enable_libsuffix+set}" = set; then if test "${enable_libsuffix+set}" = set; then
enableval="$enable_libsuffix" enableval="$enable_libsuffix"
kdelibsuff=$enableval tdelibsuff=$enableval
fi; fi;
# TODO: add an auto case that compiles a little C app to check # TODO: add an auto case that compiles a little C app to check
# where the glibc is # where the glibc is
if test "$kdelibsuff" = "no"; then if test "$tdelibsuff" = "no"; then
kdelibsuff= tdelibsuff=
fi fi
if test -z "$kdelibsuff"; then if test -z "$tdelibsuff"; then
echo "$as_me:$LINENO: result: not using lib directory suffix" >&5 echo "$as_me:$LINENO: result: not using lib directory suffix" >&5
echo "${ECHO_T}not using lib directory suffix" >&6 echo "${ECHO_T}not using lib directory suffix" >&6
@ -6865,16 +6865,16 @@ _ACEOF
else else
if test "$libdir" = '${exec_prefix}/lib'; then if test "$libdir" = '${exec_prefix}/lib'; then
libdir="$libdir${kdelibsuff}" libdir="$libdir${tdelibsuff}"
libdir="$libdir" libdir="$libdir"
fi fi
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
#define KDELIBSUFF "${kdelibsuff}" #define KDELIBSUFF "${tdelibsuff}"
_ACEOF _ACEOF
echo "$as_me:$LINENO: result: using lib directory suffix $kdelibsuff" >&5 echo "$as_me:$LINENO: result: using lib directory suffix $tdelibsuff" >&5
echo "${ECHO_T}using lib directory suffix $kdelibsuff" >&6 echo "${ECHO_T}using lib directory suffix $tdelibsuff" >&6
fi fi
# Check whether --enable-fast-install or --disable-fast-install was given. # Check whether --enable-fast-install or --disable-fast-install was given.
@ -22111,7 +22111,7 @@ if test "x$kde_cv_func_strlcat" = xyes; then
else else
case "strlcat" in case "strlcat" in
setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat) setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
kde_cv_proto_strlcat="yes - in libkdefakes" kde_cv_proto_strlcat="yes - in libtdefakes"
;; ;;
*) *)
kde_cv_proto_strlcat=unknown kde_cv_proto_strlcat=unknown
@ -22331,7 +22331,7 @@ if test "x$kde_cv_func_strlcpy" = xyes; then
else else
case "strlcpy" in case "strlcpy" in
setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat) setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
kde_cv_proto_strlcpy="yes - in libkdefakes" kde_cv_proto_strlcpy="yes - in libtdefakes"
;; ;;
*) *)
kde_cv_proto_strlcpy=unknown kde_cv_proto_strlcpy=unknown
@ -24539,7 +24539,7 @@ if test "x$kde_cv_func_res_init" = xyes; then
else else
case "res_init" in case "res_init" in
setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat) setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
kde_cv_proto_res_init="yes - in libkdefakes" kde_cv_proto_res_init="yes - in libtdefakes"
;; ;;
*) *)
kde_cv_proto_res_init=unknown kde_cv_proto_res_init=unknown
@ -28077,41 +28077,41 @@ sed 's/^/| /' conftest.$ac_ext >&5
LIBS="$ac_save_LIBS" LIBS="$ac_save_LIBS"
# First see if replacing the include by lib works. # First see if replacing the include by lib works.
# Check X11 before X11Rn because it is often a symlink to the current release. # 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}/` \ for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \
/usr/X11/lib${kdelibsuff} \ /usr/X11/lib${tdelibsuff} \
/usr/X11R6/lib${kdelibsuff} \ /usr/X11R6/lib${tdelibsuff} \
/usr/X11R5/lib${kdelibsuff} \ /usr/X11R5/lib${tdelibsuff} \
/usr/X11R4/lib${kdelibsuff} \ /usr/X11R4/lib${tdelibsuff} \
\ \
/usr/lib${kdelibsuff}/X11 \ /usr/lib${tdelibsuff}/X11 \
/usr/lib${kdelibsuff}/X11R6 \ /usr/lib${tdelibsuff}/X11R6 \
/usr/lib${kdelibsuff}/X11R5 \ /usr/lib${tdelibsuff}/X11R5 \
/usr/lib${kdelibsuff}/X11R4 \ /usr/lib${tdelibsuff}/X11R4 \
\ \
/usr/local/X11/lib${kdelibsuff} \ /usr/local/X11/lib${tdelibsuff} \
/usr/local/X11R6/lib${kdelibsuff} \ /usr/local/X11R6/lib${tdelibsuff} \
/usr/local/X11R5/lib${kdelibsuff} \ /usr/local/X11R5/lib${tdelibsuff} \
/usr/local/X11R4/lib${kdelibsuff} \ /usr/local/X11R4/lib${tdelibsuff} \
\ \
/usr/local/lib${kdelibsuff}/X11 \ /usr/local/lib${tdelibsuff}/X11 \
/usr/local/lib${kdelibsuff}/X11R6 \ /usr/local/lib${tdelibsuff}/X11R6 \
/usr/local/lib${kdelibsuff}/X11R5 \ /usr/local/lib${tdelibsuff}/X11R5 \
/usr/local/lib${kdelibsuff}/X11R4 \ /usr/local/lib${tdelibsuff}/X11R4 \
\ \
/usr/X386/lib${kdelibsuff} \ /usr/X386/lib${tdelibsuff} \
/usr/x386/lib${kdelibsuff} \ /usr/x386/lib${tdelibsuff} \
/usr/XFree86/lib${kdelibsuff}/X11 \ /usr/XFree86/lib${tdelibsuff}/X11 \
\ \
/usr/lib${kdelibsuff} \ /usr/lib${tdelibsuff} \
/usr/local/lib${kdelibsuff} \ /usr/local/lib${tdelibsuff} \
/usr/unsupported/lib${kdelibsuff} \ /usr/unsupported/lib${tdelibsuff} \
/usr/athena/lib${kdelibsuff} \ /usr/athena/lib${tdelibsuff} \
/usr/local/x11r5/lib${kdelibsuff} \ /usr/local/x11r5/lib${tdelibsuff} \
/usr/lpp/Xamples/lib${kdelibsuff} \ /usr/lpp/Xamples/lib${tdelibsuff} \
/lib/usr/lib${kdelibsuff}/X11 \ /lib/usr/lib${tdelibsuff}/X11 \
\ \
/usr/openwin/lib${kdelibsuff} \ /usr/openwin/lib${tdelibsuff} \
/usr/openwin/share/lib${kdelibsuff} \ /usr/openwin/share/lib${tdelibsuff} \
; \ ; \
do do
for ac_extension in a so sl; do for ac_extension in a so sl; do
@ -28170,7 +28170,7 @@ fi
ac_x_includes="." ac_x_includes="."
fi fi
if test -z "$ac_x_libraries"; then if test -z "$ac_x_libraries"; then
ac_x_libraries="/usr/lib${kdelibsuff}" ac_x_libraries="/usr/lib${tdelibsuff}"
fi fi
esac esac
#from now on we use our own again #from now on we use our own again
@ -29576,7 +29576,7 @@ qt_includes=""
if test "${with_qt_dir+set}" = set; then if test "${with_qt_dir+set}" = set; then
withval="$with_qt_dir" withval="$with_qt_dir"
ac_qt_includes="$withval"/include ac_qt_includes="$withval"/include
ac_qt_libraries="$withval"/lib${kdelibsuff} ac_qt_libraries="$withval"/lib${tdelibsuff}
ac_qt_bindir="$withval"/bin ac_qt_bindir="$withval"/bin
fi; fi;
@ -29640,7 +29640,7 @@ ac_qt_includes="$qt_incdir"
qt_libdirs="" qt_libdirs=""
for dir in $kde_qt_dirs; do for dir in $kde_qt_dirs; do
qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir" qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir"
done done
qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
if test ! "$ac_qt_libraries" = "NO"; then if test ! "$ac_qt_libraries" = "NO"; then
@ -30447,16 +30447,16 @@ else
if test "$kde_qtver" = 1; then if test "$kde_qtver" = 1; then
kde_check_header="ksock.h" kde_check_header="ksock.h"
kde_check_lib="libkdecore.la" kde_check_lib="libtdecore.la"
else else
kde_check_header="ksharedptr.h" kde_check_header="ksharedptr.h"
kde_check_lib="libkio.la" kde_check_lib="libtdeio.la"
fi fi
if test -z ""; then if test -z ""; then
kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs" test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs"
kde_incdirs="$ac_kde_includes $kde_incdirs" kde_incdirs="$ac_kde_includes $kde_incdirs"
kde_incdir=NO kde_incdir=NO
@ -30485,8 +30485,8 @@ So, check this please and use another prefix!" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi 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}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" 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}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}"
test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs" test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs"
kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
kde_libdir=NO kde_libdir=NO
@ -30510,7 +30510,7 @@ kde_widgetdir=NO
kde_widgetdir=NO kde_widgetdir=NO
for i in $kde_libdirs; for i in $kde_libdirs;
do do
for j in "kde3/plugins/designer/kdewidgets.la"; for j in "kde3/plugins/designer/tdewidgets.la";
do do
echo "configure: 30515: $i/$j" >&5 echo "configure: 30515: $i/$j" >&5
if test -r "$i/$j"; then if test -r "$i/$j"; then
@ -30532,13 +30532,13 @@ So, check this please and use another prefix!" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/tdewidgets.la"; then
{ { echo "$as_me:$LINENO: error: { { echo "$as_me:$LINENO: error:
I can't find the designer plugins. These are required and should have been installed I can't find the designer plugins. These are required and should have been installed
by kdelibs" >&5 by tdelibs" >&5
echo "$as_me: error: echo "$as_me: error:
I can't find the designer plugins. These are required and should have been installed I can't find the designer plugins. These are required and should have been installed
by kdelibs" >&2;} by tdelibs" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
@ -30672,20 +30672,20 @@ echo "$as_me:$LINENO: result: $kde_cv_uic_plugins" >&5
echo "${ECHO_T}$kde_cv_uic_plugins" >&6 echo "${ECHO_T}$kde_cv_uic_plugins" >&6
if test "$kde_cv_uic_plugins" != yes; then if test "$kde_cv_uic_plugins" != yes; then
{ { echo "$as_me:$LINENO: error: { { echo "$as_me:$LINENO: 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 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 kdelibs. this configure is not the same version you used to compile tdelibs.
The Qt Plugin installed by kdelibs is *ONLY* loadable if its the The Qt Plugin installed by tdelibs is *ONLY* loadable if its the
same Qt version, compiled with the same compiler and the same Qt same Qt version, compiled with the same compiler and the same Qt
configuration settings. configuration settings.
" >&5 " >&5
echo "$as_me: error: echo "$as_me: 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 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 kdelibs. this configure is not the same version you used to compile tdelibs.
The Qt Plugin installed by kdelibs is *ONLY* loadable if its the The Qt Plugin installed by tdelibs is *ONLY* loadable if its the
same Qt version, compiled with the same compiler and the same Qt same Qt version, compiled with the same compiler and the same Qt
configuration settings. configuration settings.
" >&2;} " >&2;}
@ -30861,20 +30861,20 @@ cat > conftest.$ac_ext <<EOF
#include <kapp.h> #include <kapp.h>
int main() { int main() {
printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data()); printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data()); printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data()); printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data()); printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data()); printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data()); printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data()); printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data()); printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data()); printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data()); printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
printf("kde_wallpaperdir=\\"%s\\"\n", printf("kde_wallpaperdir=\\"%s\\"\n",
KApplication::kde_wallpaperdir().data()); TDEApplication::kde_wallpaperdir().data());
printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data()); printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data()); printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
printf("kde_servicesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
printf("kde_moduledir=\\"/tmp/dummy\\"\n"); printf("kde_moduledir=\\"/tmp/dummy\\"\n");
@ -30937,7 +30937,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
echo "$as_me:$LINENO: checking for KDE libraries installed" >&5 echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6 echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6
ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5' ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5'
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>&5 (eval $ac_link) 2>&5
@ -30949,22 +30949,22 @@ echo "${ECHO_T}yes" >&6
else else
{ { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application! { { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
Check, if your compiler is installed correctly and if you have used the 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." >&5 For more details about this problem, look at the end of config.log." >&5
echo "$as_me: error: your system fails at linking a small KDE application! echo "$as_me: error: your system fails at linking a small KDE application!
Check, if your compiler is installed correctly and if you have used the 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." >&2;} For more details about this problem, look at the end of config.log." >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
if eval `KDEDIR= ./conftest 2>&5`; then if eval `TDEDIR= ./conftest 2>&5`; then
kde_result=done kde_result=done
else else
kde_result=problems kde_result=problems
fi fi
KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
kde_have_all_paths=yes kde_have_all_paths=yes
@ -31164,20 +31164,20 @@ cat > conftest.$ac_ext <<EOF
#include <kapp.h> #include <kapp.h>
int main() { int main() {
printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data()); printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data()); printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data()); printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data()); printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data()); printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data()); printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data()); printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data()); printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data()); printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data()); printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
printf("kde_wallpaperdir=\\"%s\\"\n", printf("kde_wallpaperdir=\\"%s\\"\n",
KApplication::kde_wallpaperdir().data()); TDEApplication::kde_wallpaperdir().data());
printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data()); printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data()); printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
printf("kde_servicesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
printf("kde_moduledir=\\"/tmp/dummy\\"\n"); printf("kde_moduledir=\\"/tmp/dummy\\"\n");
@ -31240,7 +31240,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
echo "$as_me:$LINENO: checking for KDE libraries installed" >&5 echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6 echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6
ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5' ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5'
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>&5 (eval $ac_link) 2>&5
@ -31252,22 +31252,22 @@ echo "${ECHO_T}yes" >&6
else else
{ { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application! { { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
Check, if your compiler is installed correctly and if you have used the 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." >&5 For more details about this problem, look at the end of config.log." >&5
echo "$as_me: error: your system fails at linking a small KDE application! echo "$as_me: error: your system fails at linking a small KDE application!
Check, if your compiler is installed correctly and if you have used the 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." >&2;} For more details about this problem, look at the end of config.log." >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
if eval `KDEDIR= ./conftest 2>&5`; then if eval `TDEDIR= ./conftest 2>&5`; then
kde_result=done kde_result=done
else else
kde_result=problems kde_result=problems
fi fi
KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
kde_have_all_paths=yes kde_have_all_paths=yes
@ -31376,11 +31376,11 @@ _ACEOF
kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin" kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs" test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
if test -n "$KDEDIRS"; then if test -n "$TDEDIRS"; then
kde_save_IFS=$IFS kde_save_IFS=$IFS
IFS=: IFS=:
for dir in $KDEDIRS; do for dir in $TDEDIRS; do
kde_default_bindirs="$dir/bin $kde_default_bindirs " kde_default_bindirs="$dir/bin $kde_default_bindirs "
done done
IFS=$kde_save_IFS IFS=$kde_save_IFS
@ -31749,12 +31749,12 @@ echo "${ECHO_T}$kde_cv_path" >&6
if test -n "$kde32ornewer"; then if test -n "$kde32ornewer"; then
echo "$as_me:$LINENO: checking for kconfig_compiler" >&5 echo "$as_me:$LINENO: checking for tdeconfig_compiler" >&5
echo $ECHO_N "checking for kconfig_compiler... $ECHO_C" >&6 echo $ECHO_N "checking for tdeconfig_compiler... $ECHO_C" >&6
if test -n "$KCONFIG_COMPILER"; then if test -n "$KCONFIG_COMPILER"; then
kde_cv_path="$KCONFIG_COMPILER"; kde_cv_path="$KCONFIG_COMPILER";
else else
kde_cache=`echo kconfig_compiler | sed 'y%./+-%__p_%'` kde_cache=`echo tdeconfig_compiler | sed 'y%./+-%__p_%'`
if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
@ -31773,16 +31773,16 @@ else
IFS=$kde_save_IFS IFS=$kde_save_IFS
for dir in $dirs; do for dir in $dirs; do
if test -x "$dir/kconfig_compiler"; then if test -x "$dir/tdeconfig_compiler"; then
if test -n "" if test -n ""
then then
evalstr="$dir/kconfig_compiler 2>&1 " evalstr="$dir/tdeconfig_compiler 2>&1 "
if eval $evalstr; then if eval $evalstr; then
kde_cv_path="$dir/kconfig_compiler" kde_cv_path="$dir/tdeconfig_compiler"
break break
fi fi
else else
kde_cv_path="$dir/kconfig_compiler" kde_cv_path="$dir/tdeconfig_compiler"
break break
fi fi
fi fi
@ -31802,10 +31802,10 @@ fi
echo "$as_me:$LINENO: result: not found" >&5 echo "$as_me:$LINENO: result: not found" >&5
echo "${ECHO_T}not found" >&6 echo "${ECHO_T}not found" >&6
{ { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found! { { echo "$as_me:$LINENO: error: The important program tdeconfig_compiler was not found!
Please check whether you installed KDE correctly. Please check whether you installed KDE correctly.
" >&5 " >&5
echo "$as_me: error: The important program kconfig_compiler was not found! echo "$as_me: error: The important program tdeconfig_compiler was not found!
Please check whether you installed KDE correctly. Please check whether you installed KDE correctly.
" >&2;} " >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
@ -31889,12 +31889,12 @@ echo "${ECHO_T}$kde_cv_path" >&6
fi fi
if test -n "$kde33ornewer"; then if test -n "$kde33ornewer"; then
echo "$as_me:$LINENO: checking for makekdewidgets" >&5 echo "$as_me:$LINENO: checking for maketdewidgets" >&5
echo $ECHO_N "checking for makekdewidgets... $ECHO_C" >&6 echo $ECHO_N "checking for maketdewidgets... $ECHO_C" >&6
if test -n "$MAKEKDEWIDGETS"; then if test -n "$MAKETDEWIDGETS"; then
kde_cv_path="$MAKEKDEWIDGETS"; kde_cv_path="$MAKETDEWIDGETS";
else else
kde_cache=`echo makekdewidgets | sed 'y%./+-%__p_%'` kde_cache=`echo maketdewidgets | sed 'y%./+-%__p_%'`
if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
@ -31913,16 +31913,16 @@ else
IFS=$kde_save_IFS IFS=$kde_save_IFS
for dir in $dirs; do for dir in $dirs; do
if test -x "$dir/makekdewidgets"; then if test -x "$dir/maketdewidgets"; then
if test -n "" if test -n ""
then then
evalstr="$dir/makekdewidgets 2>&1 " evalstr="$dir/maketdewidgets 2>&1 "
if eval $evalstr; then if eval $evalstr; then
kde_cv_path="$dir/makekdewidgets" kde_cv_path="$dir/maketdewidgets"
break break
fi fi
else else
kde_cv_path="$dir/makekdewidgets" kde_cv_path="$dir/maketdewidgets"
break break
fi fi
fi fi
@ -31942,10 +31942,10 @@ fi
echo "$as_me:$LINENO: result: not found" >&5 echo "$as_me:$LINENO: result: not found" >&5
echo "${ECHO_T}not found" >&6 echo "${ECHO_T}not found" >&6
{ { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found! { { echo "$as_me:$LINENO: error: The important program maketdewidgets was not found!
Please check whether you installed KDE correctly. Please check whether you installed KDE correctly.
" >&5 " >&5
echo "$as_me: error: The important program makekdewidgets was not found! echo "$as_me: error: The important program maketdewidgets was not found!
Please check whether you installed KDE correctly. Please check whether you installed KDE correctly.
" >&2;} " >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
@ -31953,7 +31953,7 @@ Please check whether you installed KDE correctly.
else else
echo "$as_me:$LINENO: result: $kde_cv_path" >&5 echo "$as_me:$LINENO: result: $kde_cv_path" >&5
echo "${ECHO_T}$kde_cv_path" >&6 echo "${ECHO_T}$kde_cv_path" >&6
MAKEKDEWIDGETS=$kde_cv_path MAKETDEWIDGETS=$kde_cv_path
fi fi
@ -32023,7 +32023,7 @@ echo "${ECHO_T}$kde_cv_path" >&6
if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then
kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share" kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs" test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs"
KDE_XSL_STYLESHEET=NO KDE_XSL_STYLESHEET=NO
for i in $kde_sharedirs; for i in $kde_sharedirs;
@ -32085,7 +32085,7 @@ done
kdeinitdir='$(kde_moduledir)' tdeinitdir='$(kde_moduledir)'
@ -32103,11 +32103,11 @@ fi
if test $kde_qtver = 3; then if test $kde_qtver = 3; then
LIB_KDECORE="-lkdecore" LIB_TDECORE="-ltdecore"
LIB_KDEUI="-lkdeui" LIB_TDEUI="-ltdeui"
LIB_KIO="-lkio" LIB_TDEIO="-ltdeio"
LIB_KJS="-lkjs" LIB_KJS="-lkjs"
@ -32115,64 +32115,64 @@ if test $kde_qtver = 3; then
LIB_KAB="-lkab" LIB_KAB="-lkab"
LIB_KABC="-lkabc" LIB_KABC="-ltdeabc"
LIB_KHTML="-lkhtml" LIB_TDEHTML="-ltdehtml"
LIB_KSPELL="-lkspell" LIB_TDESPELL="-ltdespell"
LIB_KPARTS="-lkparts" LIB_TDEPARTS="-ltdeparts"
LIB_KDEPRINT="-lkdeprint" LIB_TDEPRINT="-ltdeprint"
LIB_KUTILS="-lkutils" LIB_TDEUTILS="-ltdeutils"
LIB_KDEPIM="-lkdepim" LIB_TDEPIM="-ltdepim"
LIB_KIMPROXY="-lkimproxy" LIB_TDEIMPROXY="-ltdeimproxy"
LIB_KNEWSTUFF="-lknewstuff" LIB_KNEWSTUFF="-lknewstuff"
LIB_KDNSSD="-lkdnssd" LIB_TDEDNSSD="-ltdednssd"
# these are for backward compatibility # these are for backward compatibility
LIB_KSYCOCA="-lkio" LIB_TDESYCOCA="-ltdeio"
LIB_KFILE="-lkio" LIB_KFILE="-ltdeio"
elif test $kde_qtver = 2; then elif test $kde_qtver = 2; then
LIB_KDECORE="-lkdecore" LIB_TDECORE="-ltdecore"
LIB_KDEUI="-lkdeui" LIB_TDEUI="-ltdeui"
LIB_KIO="-lkio" LIB_TDEIO="-ltdeio"
LIB_KSYCOCA="-lksycoca" LIB_TDESYCOCA="-ltdesycoca"
LIB_SMB="-lsmb" LIB_SMB="-lsmb"
LIB_KFILE="-lkfile" LIB_KFILE="-ltdefile"
LIB_KAB="-lkab" LIB_KAB="-lkab"
LIB_KHTML="-lkhtml" LIB_TDEHTML="-ltdehtml"
LIB_KSPELL="-lkspell" LIB_TDESPELL="-ltdespell"
LIB_KPARTS="-lkparts" LIB_TDEPARTS="-ltdeparts"
LIB_KDEPRINT="-lkdeprint" LIB_TDEPRINT="-ltdeprint"
else else
LIB_KDECORE="-lkdecore -lXext $(LIB_QT)" LIB_TDECORE="-ltdecore -lXext $(LIB_QT)"
LIB_KDEUI="-lkdeui $(LIB_KDECORE)" LIB_TDEUI="-ltdeui $(LIB_TDECORE)"
LIB_KFM="-lkfm $(LIB_KDECORE)" LIB_KFM="-lkfm $(LIB_TDECORE)"
LIB_KFILE="-lkfile $(LIB_KFM) $(LIB_KDEUI)" LIB_KFILE="-ltdefile $(LIB_KFM) $(LIB_TDEUI)"
LIB_KAB="-lkab $(LIB_KIMGIO) $(LIB_KDECORE)" LIB_KAB="-lkab $(LIB_KIMGIO) $(LIB_TDECORE)"
fi fi
@ -33331,7 +33331,7 @@ s,@all_libraries@,$all_libraries,;t t
s,@AUTODIRS@,$AUTODIRS,;t t s,@AUTODIRS@,$AUTODIRS,;t t
s,@include_ARTS_TRUE@,$include_ARTS_TRUE,;t t s,@include_ARTS_TRUE@,$include_ARTS_TRUE,;t t
s,@include_ARTS_FALSE@,$include_ARTS_FALSE,;t t s,@include_ARTS_FALSE@,$include_ARTS_FALSE,;t t
s,@MAKEKDEWIDGETS@,$MAKEKDEWIDGETS,;t t s,@MAKETDEWIDGETS@,$MAKETDEWIDGETS,;t t
s,@KCONFIG_COMPILER@,$KCONFIG_COMPILER,;t t s,@KCONFIG_COMPILER@,$KCONFIG_COMPILER,;t t
s,@KCFG_DEPENDENCIES@,$KCFG_DEPENDENCIES,;t t s,@KCFG_DEPENDENCIES@,$KCFG_DEPENDENCIES,;t t
s,@DCOPIDLNG@,$DCOPIDLNG,;t t s,@DCOPIDLNG@,$DCOPIDLNG,;t t
@ -33361,26 +33361,26 @@ s,@kde_templatesdir@,$kde_templatesdir,;t t
s,@kde_servicesdir@,$kde_servicesdir,;t t s,@kde_servicesdir@,$kde_servicesdir,;t t
s,@kde_servicetypesdir@,$kde_servicetypesdir,;t t s,@kde_servicetypesdir@,$kde_servicetypesdir,;t t
s,@kde_moduledir@,$kde_moduledir,;t t s,@kde_moduledir@,$kde_moduledir,;t t
s,@kdeinitdir@,$kdeinitdir,;t t s,@tdeinitdir@,$tdeinitdir,;t t
s,@kde_styledir@,$kde_styledir,;t t s,@kde_styledir@,$kde_styledir,;t t
s,@kde_widgetdir@,$kde_widgetdir,;t t s,@kde_widgetdir@,$kde_widgetdir,;t t
s,@LIB_KDECORE@,$LIB_KDECORE,;t t s,@LIB_TDECORE@,$LIB_TDECORE,;t t
s,@LIB_KDEUI@,$LIB_KDEUI,;t t s,@LIB_TDEUI@,$LIB_TDEUI,;t t
s,@LIB_KIO@,$LIB_KIO,;t t s,@LIB_TDEIO@,$LIB_TDEIO,;t t
s,@LIB_KJS@,$LIB_KJS,;t t s,@LIB_KJS@,$LIB_KJS,;t t
s,@LIB_SMB@,$LIB_SMB,;t t s,@LIB_SMB@,$LIB_SMB,;t t
s,@LIB_KAB@,$LIB_KAB,;t t s,@LIB_KAB@,$LIB_KAB,;t t
s,@LIB_KABC@,$LIB_KABC,;t t s,@LIB_KABC@,$LIB_KABC,;t t
s,@LIB_KHTML@,$LIB_KHTML,;t t s,@LIB_TDEHTML@,$LIB_TDEHTML,;t t
s,@LIB_KSPELL@,$LIB_KSPELL,;t t s,@LIB_TDESPELL@,$LIB_TDESPELL,;t t
s,@LIB_KPARTS@,$LIB_KPARTS,;t t s,@LIB_TDEPARTS@,$LIB_TDEPARTS,;t t
s,@LIB_KDEPRINT@,$LIB_KDEPRINT,;t t s,@LIB_TDEPRINT@,$LIB_TDEPRINT,;t t
s,@LIB_KUTILS@,$LIB_KUTILS,;t t s,@LIB_TDEUTILS@,$LIB_TDEUTILS,;t t
s,@LIB_KDEPIM@,$LIB_KDEPIM,;t t s,@LIB_TDEPIM@,$LIB_TDEPIM,;t t
s,@LIB_KIMPROXY@,$LIB_KIMPROXY,;t t s,@LIB_TDEIMPROXY@,$LIB_TDEIMPROXY,;t t
s,@LIB_KNEWSTUFF@,$LIB_KNEWSTUFF,;t t s,@LIB_KNEWSTUFF@,$LIB_KNEWSTUFF,;t t
s,@LIB_KDNSSD@,$LIB_KDNSSD,;t t s,@LIB_TDEDNSSD@,$LIB_TDEDNSSD,;t t
s,@LIB_KSYCOCA@,$LIB_KSYCOCA,;t t s,@LIB_TDESYCOCA@,$LIB_TDESYCOCA,;t t
s,@LIB_KFILE@,$LIB_KFILE,;t t s,@LIB_KFILE@,$LIB_KFILE,;t t
s,@LIB_KFM@,$LIB_KFM,;t t s,@LIB_KFM@,$LIB_KFM,;t t
s,@TOPSUBDIRS@,$TOPSUBDIRS,;t t s,@TOPSUBDIRS@,$TOPSUBDIRS,;t t
@ -34111,13 +34111,13 @@ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then
# And if so, warn when they don't match # And if so, warn when they don't match
if test "$kde_libs_prefix" != "$given_prefix"; then if test "$kde_libs_prefix" != "$given_prefix"; then
# And if kde doesn't know about the prefix yet # And if kde doesn't know about the prefix yet
echo ":"`kde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null echo ":"`tde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null
if test $? -ne 0; then if test $? -ne 0; then
echo "" echo ""
echo "Warning: you chose to install this package in $given_prefix," echo "Warning: you chose to install this package in $given_prefix,"
echo "but KDE was found in $kde_libs_prefix." echo "but KDE was found in $kde_libs_prefix."
echo "For this to work, you will need to tell KDE about the new prefix, by ensuring" echo "For this to work, you will need to tell KDE about the new prefix, by ensuring"
echo "that KDEDIRS contains it, e.g. export KDEDIRS=$given_prefix:$kde_libs_prefix" echo "that TDEDIRS contains it, e.g. export TDEDIRS=$given_prefix:$kde_libs_prefix"
echo "Then restart KDE." echo "Then restart KDE."
echo "" echo ""
fi fi

4
configure.in
Unescape View File

@ -81,13 +81,13 @@ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then
# And if so, warn when they don't match # And if so, warn when they don't match
if test "$kde_libs_prefix" != "$given_prefix"; then if test "$kde_libs_prefix" != "$given_prefix"; then
# And if kde doesn't know about the prefix yet # And if kde doesn't know about the prefix yet
echo ":"`kde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null echo ":"`tde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null
if test $? -ne 0; then if test $? -ne 0; then
echo "" echo ""
echo "Warning: you chose to install this package in $given_prefix," echo "Warning: you chose to install this package in $given_prefix,"
echo "but KDE was found in $kde_libs_prefix." echo "but KDE was found in $kde_libs_prefix."
echo "For this to work, you will need to tell KDE about the new prefix, by ensuring" echo "For this to work, you will need to tell KDE about the new prefix, by ensuring"
echo "that KDEDIRS contains it, e.g. export KDEDIRS=$given_prefix:$kde_libs_prefix" echo "that TDEDIRS contains it, e.g. export TDEDIRS=$given_prefix:$kde_libs_prefix"
echo "Then restart KDE." echo "Then restart KDE."
echo "" echo ""
fi fi

2
debian/control vendored
Unescape View File

@ -2,7 +2,7 @@ Source: kommando
Section: kde Section: kde
Priority: optional Priority: optional
Maintainer: Sune Vuorela <debian@pusling.com> Maintainer: Sune Vuorela <debian@pusling.com>
Build-Depends: debhelper (>= 5.0.0), kdelibs4-dev, autotools-dev, tquilt Build-Depends: debhelper (>= 5.0.0), tdelibs4-dev, autotools-dev, tquilt
Standards-Version: 3.7.2 Standards-Version: 3.7.2
Package: kommando Package: kommando

6
debian/patches/02_fix_src_makefile.am.diff vendored
Unescape View File

@ -3,9 +3,9 @@
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
kcm_kommando_la_SOURCES = configdialogimpl.cpp configdialog.ui \ kcm_kommando_la_SOURCES = configdialogimpl.cpp configdialog.ui \
kcmkommando.cpp servicemenu.cpp kcmkommando.cpp servicemenu.cpp
kcm_kommando_la_LIBADD = libkommando.la -lXmu $(LIB_KIO) $(LIB_KDEUI) \ kcm_kommando_la_LIBADD = libkommando.la -lXmu $(LIB_TDEIO) $(LIB_TDEUI) \
- $(LIB_KDECORE) - $(LIB_TDECORE)
+ $(LIB_KDECORE) $(LIB_QT) -lDCOP + $(LIB_TDECORE) $(LIB_QT) -lDCOP
# this is where the desktop file will go # this is where the desktop file will go
xdg_apps_DATA = kommando.desktop xdg_apps_DATA = kommando.desktop

1534
debian/patches/98_buildprep.diff vendored
View File

File diff suppressed because it is too large Load Diff

28
doc/Makefile.in
Unescape View File

@ -153,22 +153,22 @@ LIBUTIL = @LIBUTIL@
LIBZ = @LIBZ@ LIBZ = @LIBZ@
LIB_KAB = @LIB_KAB@ LIB_KAB = @LIB_KAB@
LIB_KABC = @LIB_KABC@ LIB_KABC = @LIB_KABC@
LIB_KDECORE = @LIB_KDECORE@ LIB_TDECORE = @LIB_TDECORE@
LIB_KDEPIM = @LIB_KDEPIM@ LIB_TDEPIM = @LIB_TDEPIM@
LIB_KDEPRINT = @LIB_KDEPRINT@ LIB_TDEPRINT = @LIB_TDEPRINT@
LIB_KDEUI = @LIB_KDEUI@ LIB_TDEUI = @LIB_TDEUI@
LIB_KDNSSD = @LIB_KDNSSD@ LIB_TDEDNSSD = @LIB_TDEDNSSD@
LIB_KFILE = @LIB_KFILE@ LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@ LIB_KFM = @LIB_KFM@
LIB_KHTML = @LIB_KHTML@ LIB_TDEHTML = @LIB_TDEHTML@
LIB_KIMPROXY = @LIB_KIMPROXY@ LIB_TDEIMPROXY = @LIB_TDEIMPROXY@
LIB_KIO = @LIB_KIO@ LIB_TDEIO = @LIB_TDEIO@
LIB_KJS = @LIB_KJS@ LIB_KJS = @LIB_KJS@
LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
LIB_KPARTS = @LIB_KPARTS@ LIB_TDEPARTS = @LIB_TDEPARTS@
LIB_KSPELL = @LIB_KSPELL@ LIB_TDESPELL = @LIB_TDESPELL@
LIB_KSYCOCA = @LIB_KSYCOCA@ LIB_TDESYCOCA = @LIB_TDESYCOCA@
LIB_KUTILS = @LIB_KUTILS@ LIB_TDEUTILS = @LIB_TDEUTILS@
LIB_POLL = @LIB_POLL@ LIB_POLL = @LIB_POLL@
LIB_QPE = @LIB_QPE@ LIB_QPE = @LIB_QPE@
LIB_QT = @LIB_QT@ LIB_QT = @LIB_QT@
@ -179,7 +179,7 @@ LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MAKETDEWIDGETS = @MAKETDEWIDGETS@
MCOPIDL = @MCOPIDL@ MCOPIDL = @MCOPIDL@
MEINPROC = @MEINPROC@ MEINPROC = @MEINPROC@
MOC = @MOC@ MOC = @MOC@
@ -278,7 +278,7 @@ kde_styledir = @kde_styledir@
kde_templatesdir = @kde_templatesdir@ kde_templatesdir = @kde_templatesdir@
kde_wallpaperdir = @kde_wallpaperdir@ kde_wallpaperdir = @kde_wallpaperdir@
kde_widgetdir = @kde_widgetdir@ kde_widgetdir = @kde_widgetdir@
kdeinitdir = @kdeinitdir@ tdeinitdir = @tdeinitdir@
libdir = @libdir@ libdir = @libdir@
libexecdir = @libexecdir@ libexecdir = @libexecdir@
localstatedir = @localstatedir@ localstatedir = @localstatedir@

28
doc/en/Makefile.in
Unescape View File

@ -134,22 +134,22 @@ LIBUTIL = @LIBUTIL@
LIBZ = @LIBZ@ LIBZ = @LIBZ@
LIB_KAB = @LIB_KAB@ LIB_KAB = @LIB_KAB@
LIB_KABC = @LIB_KABC@ LIB_KABC = @LIB_KABC@
LIB_KDECORE = @LIB_KDECORE@ LIB_TDECORE = @LIB_TDECORE@
LIB_KDEPIM = @LIB_KDEPIM@ LIB_TDEPIM = @LIB_TDEPIM@
LIB_KDEPRINT = @LIB_KDEPRINT@ LIB_TDEPRINT = @LIB_TDEPRINT@
LIB_KDEUI = @LIB_KDEUI@ LIB_TDEUI = @LIB_TDEUI@
LIB_KDNSSD = @LIB_KDNSSD@ LIB_TDEDNSSD = @LIB_TDEDNSSD@
LIB_KFILE = @LIB_KFILE@ LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@ LIB_KFM = @LIB_KFM@
LIB_KHTML = @LIB_KHTML@ LIB_TDEHTML = @LIB_TDEHTML@
LIB_KIMPROXY = @LIB_KIMPROXY@ LIB_TDEIMPROXY = @LIB_TDEIMPROXY@
LIB_KIO = @LIB_KIO@ LIB_TDEIO = @LIB_TDEIO@
LIB_KJS = @LIB_KJS@ LIB_KJS = @LIB_KJS@
LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
LIB_KPARTS = @LIB_KPARTS@ LIB_TDEPARTS = @LIB_TDEPARTS@
LIB_KSPELL = @LIB_KSPELL@ LIB_TDESPELL = @LIB_TDESPELL@
LIB_KSYCOCA = @LIB_KSYCOCA@ LIB_TDESYCOCA = @LIB_TDESYCOCA@
LIB_KUTILS = @LIB_KUTILS@ LIB_TDEUTILS = @LIB_TDEUTILS@
LIB_POLL = @LIB_POLL@ LIB_POLL = @LIB_POLL@
LIB_QPE = @LIB_QPE@ LIB_QPE = @LIB_QPE@
LIB_QT = @LIB_QT@ LIB_QT = @LIB_QT@
@ -160,7 +160,7 @@ LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MAKETDEWIDGETS = @MAKETDEWIDGETS@
MCOPIDL = @MCOPIDL@ MCOPIDL = @MCOPIDL@
MEINPROC = @MEINPROC@ MEINPROC = @MEINPROC@
MOC = @MOC@ MOC = @MOC@
@ -259,7 +259,7 @@ kde_styledir = @kde_styledir@
kde_templatesdir = @kde_templatesdir@ kde_templatesdir = @kde_templatesdir@
kde_wallpaperdir = @kde_wallpaperdir@ kde_wallpaperdir = @kde_wallpaperdir@
kde_widgetdir = @kde_widgetdir@ kde_widgetdir = @kde_widgetdir@
kdeinitdir = @kdeinitdir@ tdeinitdir = @tdeinitdir@
libdir = @libdir@ libdir = @libdir@
libexecdir = @libexecdir@ libexecdir = @libexecdir@
localstatedir = @localstatedir@ localstatedir = @localstatedir@

6
doc/en/index.docbook
Unescape View File

@ -2,7 +2,7 @@
<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
<!ENTITY kommando "<application>Kommando 0.1</application>"> <!ENTITY kommando "<application>Kommando 0.1</application>">
<!ENTITY kappname "&kommando;"><!-- Do *not* replace kappname--> <!ENTITY kappname "&kommando;"><!-- Do *not* replace kappname-->
<!ENTITY package "kde-module"><!-- kdebase, kdeadmin, etc --> <!ENTITY package "kde-module"><!-- tdebase, tdeadmin, etc -->
<!ENTITY % addindex "IGNORE"> <!ENTITY % addindex "IGNORE">
<!ENTITY % English "INCLUDE"><!-- change language only here --> <!ENTITY % English "INCLUDE"><!-- change language only here -->
@ -488,8 +488,8 @@ application -->
<!-- <!--
List any special requirements for your application here. This should include: List any special requirements for your application here. This should include:
.Libraries or other software that is not included in kdesupport, .Libraries or other software that is not included in tdesupport,
kdelibs, or kdebase. tdelibs, or tdebase.
.Hardware requirements like amount of RAM, disk space, graphics card .Hardware requirements like amount of RAM, disk space, graphics card
capabilities, screen resolution, special expansion cards, etc. capabilities, screen resolution, special expansion cards, etc.
.Operating systems the app will run on. If your app is designed only for a .Operating systems the app will run on. If your app is designed only for a

28
po/Makefile.in
Unescape View File

@ -134,22 +134,22 @@ LIBUTIL = @LIBUTIL@
LIBZ = @LIBZ@ LIBZ = @LIBZ@
LIB_KAB = @LIB_KAB@ LIB_KAB = @LIB_KAB@
LIB_KABC = @LIB_KABC@ LIB_KABC = @LIB_KABC@
LIB_KDECORE = @LIB_KDECORE@ LIB_TDECORE = @LIB_TDECORE@
LIB_KDEPIM = @LIB_KDEPIM@ LIB_TDEPIM = @LIB_TDEPIM@
LIB_KDEPRINT = @LIB_KDEPRINT@ LIB_TDEPRINT = @LIB_TDEPRINT@
LIB_KDEUI = @LIB_KDEUI@ LIB_TDEUI = @LIB_TDEUI@
LIB_KDNSSD = @LIB_KDNSSD@ LIB_TDEDNSSD = @LIB_TDEDNSSD@
LIB_KFILE = @LIB_KFILE@ LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@ LIB_KFM = @LIB_KFM@
LIB_KHTML = @LIB_KHTML@ LIB_TDEHTML = @LIB_TDEHTML@
LIB_KIMPROXY = @LIB_KIMPROXY@ LIB_TDEIMPROXY = @LIB_TDEIMPROXY@
LIB_KIO = @LIB_KIO@ LIB_TDEIO = @LIB_TDEIO@
LIB_KJS = @LIB_KJS@ LIB_KJS = @LIB_KJS@
LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
LIB_KPARTS = @LIB_KPARTS@ LIB_TDEPARTS = @LIB_TDEPARTS@
LIB_KSPELL = @LIB_KSPELL@ LIB_TDESPELL = @LIB_TDESPELL@
LIB_KSYCOCA = @LIB_KSYCOCA@ LIB_TDESYCOCA = @LIB_TDESYCOCA@
LIB_KUTILS = @LIB_KUTILS@ LIB_TDEUTILS = @LIB_TDEUTILS@
LIB_POLL = @LIB_POLL@ LIB_POLL = @LIB_POLL@
LIB_QPE = @LIB_QPE@ LIB_QPE = @LIB_QPE@
LIB_QT = @LIB_QT@ LIB_QT = @LIB_QT@
@ -160,7 +160,7 @@ LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MAKETDEWIDGETS = @MAKETDEWIDGETS@
MCOPIDL = @MCOPIDL@ MCOPIDL = @MCOPIDL@
MEINPROC = @MEINPROC@ MEINPROC = @MEINPROC@
MOC = @MOC@ MOC = @MOC@
@ -259,7 +259,7 @@ kde_styledir = @kde_styledir@
kde_templatesdir = @kde_templatesdir@ kde_templatesdir = @kde_templatesdir@
kde_wallpaperdir = @kde_wallpaperdir@ kde_wallpaperdir = @kde_wallpaperdir@
kde_widgetdir = @kde_widgetdir@ kde_widgetdir = @kde_widgetdir@
kdeinitdir = @kdeinitdir@ tdeinitdir = @tdeinitdir@
libdir = @libdir@ libdir = @libdir@
libexecdir = @libexecdir@ libexecdir = @libexecdir@
localstatedir = @localstatedir@ localstatedir = @localstatedir@

8
src/Makefile.am
Unescape View File

@ -23,7 +23,7 @@ lib_LTLIBRARIES = libkommando.la
libkommando_la_SOURCES = menulistviewitem.cpp configuration.cpp menu.cpp \ libkommando_la_SOURCES = menulistviewitem.cpp configuration.cpp menu.cpp \
commandobutton.cpp roundbutton.cpp kommandoview.cpp commandobutton.cpp roundbutton.cpp kommandoview.cpp
libkommando_la_LDFLAGS = -version-info 1:0:0 $(all_libraries) libkommando_la_LDFLAGS = -version-info 1:0:0 $(all_libraries)
libkommando_la_LIBADD = $(LIB_KDECORE) libkommando_la_LIBADD = $(LIB_TDECORE)
######################################################################### #########################################################################
# KDE MODULES SECTION # KDE MODULES SECTION
@ -35,7 +35,7 @@ kde_module_LTLIBRARIES = kded_kommandod.la kcm_kommando.la
kded_kommandod_la_SOURCES = kommandod.cpp kommandod.skel kommando.cpp kded_kommandod_la_SOURCES = kommandod.cpp kommandod.skel kommando.cpp
kded_kommandod_la_METASOURCES = AUTO kded_kommandod_la_METASOURCES = AUTO
kded_kommandod_la_LDFLAGS = -avoid-version -module $(all_libraries) kded_kommandod_la_LDFLAGS = -avoid-version -module $(all_libraries)
kded_kommandod_la_LIBADD = -lXmu libkommando.la $(LIB_KDECORE) kded_kommandod_la_LIBADD = -lXmu libkommando.la $(LIB_TDECORE)
servicesdir = $(kde_servicesdir)/kded servicesdir = $(kde_servicesdir)/kded
services_DATA = kommandod.desktop services_DATA = kommandod.desktop
@ -43,8 +43,8 @@ services_DATA = kommandod.desktop
kcm_kommando_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries) kcm_kommando_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
kcm_kommando_la_SOURCES = configdialogimpl.cpp configdialog.ui \ kcm_kommando_la_SOURCES = configdialogimpl.cpp configdialog.ui \
kcmkommando.cpp servicemenu.cpp kcmkommando.cpp servicemenu.cpp
kcm_kommando_la_LIBADD = libkommando.la -lXmu $(LIB_KIO) $(LIB_KDEUI) \ kcm_kommando_la_LIBADD = libkommando.la -lXmu $(LIB_TDEIO) $(LIB_TDEUI) \
$(LIB_KDECORE) $(LIB_TDECORE)
# this is where the desktop file will go # this is where the desktop file will go
xdg_apps_DATA = kommando.desktop xdg_apps_DATA = kommando.desktop

38
src/Makefile.in
Unescape View File

@ -208,22 +208,22 @@ LIBUTIL = @LIBUTIL@
LIBZ = @LIBZ@ LIBZ = @LIBZ@
LIB_KAB = @LIB_KAB@ LIB_KAB = @LIB_KAB@
LIB_KABC = @LIB_KABC@ LIB_KABC = @LIB_KABC@
LIB_KDECORE = @LIB_KDECORE@ LIB_TDECORE = @LIB_TDECORE@
LIB_KDEPIM = @LIB_KDEPIM@ LIB_TDEPIM = @LIB_TDEPIM@
LIB_KDEPRINT = @LIB_KDEPRINT@ LIB_TDEPRINT = @LIB_TDEPRINT@
LIB_KDEUI = @LIB_KDEUI@ LIB_TDEUI = @LIB_TDEUI@
LIB_KDNSSD = @LIB_KDNSSD@ LIB_TDEDNSSD = @LIB_TDEDNSSD@
LIB_KFILE = @LIB_KFILE@ LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@ LIB_KFM = @LIB_KFM@
LIB_KHTML = @LIB_KHTML@ LIB_TDEHTML = @LIB_TDEHTML@
LIB_KIMPROXY = @LIB_KIMPROXY@ LIB_TDEIMPROXY = @LIB_TDEIMPROXY@
LIB_KIO = @LIB_KIO@ LIB_TDEIO = @LIB_TDEIO@
LIB_KJS = @LIB_KJS@ LIB_KJS = @LIB_KJS@
LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
LIB_KPARTS = @LIB_KPARTS@ LIB_TDEPARTS = @LIB_TDEPARTS@
LIB_KSPELL = @LIB_KSPELL@ LIB_TDESPELL = @LIB_TDESPELL@
LIB_KSYCOCA = @LIB_KSYCOCA@ LIB_TDESYCOCA = @LIB_TDESYCOCA@
LIB_KUTILS = @LIB_KUTILS@ LIB_TDEUTILS = @LIB_TDEUTILS@
LIB_POLL = @LIB_POLL@ LIB_POLL = @LIB_POLL@
LIB_QPE = @LIB_QPE@ LIB_QPE = @LIB_QPE@
LIB_QT = @LIB_QT@ LIB_QT = @LIB_QT@
@ -234,7 +234,7 @@ LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MAKETDEWIDGETS = @MAKETDEWIDGETS@
MCOPIDL = @MCOPIDL@ MCOPIDL = @MCOPIDL@
MEINPROC = @MEINPROC@ MEINPROC = @MEINPROC@
MOC = @MOC@ MOC = @MOC@
@ -333,7 +333,7 @@ kde_styledir = @kde_styledir@
kde_templatesdir = @kde_templatesdir@ kde_templatesdir = @kde_templatesdir@
kde_wallpaperdir = @kde_wallpaperdir@ kde_wallpaperdir = @kde_wallpaperdir@
kde_widgetdir = @kde_widgetdir@ kde_widgetdir = @kde_widgetdir@
kdeinitdir = @kdeinitdir@ tdeinitdir = @tdeinitdir@
libdir = @libdir@ libdir = @libdir@
libexecdir = @libexecdir@ libexecdir = @libexecdir@
localstatedir = @localstatedir@ localstatedir = @localstatedir@
@ -381,7 +381,7 @@ libkommando_la_SOURCES = menulistviewitem.cpp configuration.cpp menu.cpp \
commandobutton.cpp roundbutton.cpp kommandoview.cpp commandobutton.cpp roundbutton.cpp kommandoview.cpp
libkommando_la_LDFLAGS = -version-info 1:0:0 $(all_libraries) libkommando_la_LDFLAGS = -version-info 1:0:0 $(all_libraries)
libkommando_la_LIBADD = $(LIB_KDECORE) libkommando_la_LIBADD = $(LIB_TDECORE)
######################################################################### #########################################################################
# KDE MODULES SECTION # KDE MODULES SECTION
@ -394,7 +394,7 @@ kde_module_LTLIBRARIES = kded_kommandod.la kcm_kommando.la
kded_kommandod_la_SOURCES=kommandod.cpp kommando.cpp kommandod_skel.cpp kded_kommandod_la_SOURCES=kommandod.cpp kommando.cpp kommandod_skel.cpp
#>- kded_kommandod_la_METASOURCES = AUTO #>- kded_kommandod_la_METASOURCES = AUTO
kded_kommandod_la_LDFLAGS = -avoid-version -module $(all_libraries) kded_kommandod_la_LDFLAGS = -avoid-version -module $(all_libraries)
kded_kommandod_la_LIBADD = -lXmu libkommando.la $(LIB_KDECORE) kded_kommandod_la_LIBADD = -lXmu libkommando.la $(LIB_TDECORE)
servicesdir = $(kde_servicesdir)/kded servicesdir = $(kde_servicesdir)/kded
services_DATA = kommandod.desktop services_DATA = kommandod.desktop
#>- kcm_kommando_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries) #>- kcm_kommando_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
@ -406,8 +406,8 @@ kcm_kommando_la_LDFLAGS = -avoid-version -module -no-undefined $(KDE_NO_UNDEFINE
kcm_kommando_la_SOURCES=configdialogimpl.cpp \ kcm_kommando_la_SOURCES=configdialogimpl.cpp \
kcmkommando.cpp servicemenu.cpp configdialog.cpp kcmkommando.cpp servicemenu.cpp configdialog.cpp
kcm_kommando_la_LIBADD = libkommando.la -lXmu $(LIB_KIO) $(LIB_KDEUI) \ kcm_kommando_la_LIBADD = libkommando.la -lXmu $(LIB_TDEIO) $(LIB_TDEUI) \
$(LIB_KDECORE) $(LIB_TDECORE)
# this is where the desktop file will go # this is where the desktop file will go
@ -1043,7 +1043,7 @@ $(srcdir)/kcmkommando.cpp: configdialog.h
configdialog.cpp: $(srcdir)/configdialog.ui configdialog.h configdialog.moc configdialog.cpp: $(srcdir)/configdialog.ui configdialog.h configdialog.moc
rm -f configdialog.cpp rm -f configdialog.cpp
echo '#include <kdialog.h>' > configdialog.cpp echo '#include <kdialog.h>' > configdialog.cpp
echo '#include <klocale.h>' >> configdialog.cpp echo '#include <tdelocale.h>' >> configdialog.cpp
$(UIC) -tr ${UIC_TR} -i configdialog.h $(srcdir)/configdialog.ui > configdialog.cpp.temp ; ret=$$?; \ $(UIC) -tr ${UIC_TR} -i configdialog.h $(srcdir)/configdialog.ui > configdialog.cpp.temp ; ret=$$?; \
$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" configdialog.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_configdialog,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> configdialog.cpp ;\ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" configdialog.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_configdialog,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> configdialog.cpp ;\
rm -f configdialog.cpp.temp ;\ rm -f configdialog.cpp.temp ;\

2
src/commandobutton.cpp
Unescape View File

@ -61,7 +61,7 @@ SubmenuButton::SubmenuButton( TQWidget * parent, Menu * submenu, unsigned short
TQPixmap overlay = MainBarIcon("kommando_overlay",radius*2); TQPixmap overlay = MainBarIcon("kommando_overlay",radius*2);
TQImage temp1(icon.convertToImage()); TQImage temp1(icon.convertToImage());
TQImage temp2(overlay.convertToImage()); TQImage temp2(overlay.convertToImage());
KIconEffect::overlay(temp1,temp2); TDEIconEffect::overlay(temp1,temp2);
icon.convertFromImage(temp1); icon.convertFromImage(temp1);
setPixmap(icon); setPixmap(icon);
setMask(icon.createHeuristicMask()); setMask(icon.createHeuristicMask());

2
src/configdialog.ui
Unescape View File

@ -247,7 +247,7 @@
<string>Icon:&lt;p align="left"&gt;&lt;/p&gt;</string> <string>Icon:&lt;p align="left"&gt;&lt;/p&gt;</string>
</property> </property>
</widget> </widget>
<widget class="KIconButton"> <widget class="TDEIconButton">
<property name="name"> <property name="name">
<cstring>iconButton</cstring> <cstring>iconButton</cstring>
</property> </property>

14
src/configdialogimpl.cpp
Unescape View File

@ -20,14 +20,14 @@
#include "configdialogimpl.h" #include "configdialogimpl.h"
#include <klocale.h> #include <tdelocale.h>
#include <kicondialog.h> #include <kicondialog.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kkeybutton.h> #include <kkeybutton.h>
#include <kcolorbutton.h> #include <kcolorbutton.h>
#include <kkeydialog.h> #include <kkeydialog.h>
#include <kservicegroup.h> #include <kservicegroup.h>
#include <kapplication.h> #include <tdeapplication.h>
#include <dcopclient.h> #include <dcopclient.h>
#include <ntqslider.h> #include <ntqslider.h>
@ -54,12 +54,12 @@ ConfigDialogImpl::ConfigDialogImpl(TQWidget* parent, const char* name, WFlags fl
curListView(0), curListView(0),
mMenus(true) mMenus(true)
{ {
new TQListBoxPixmap(listBox,MainBarIcon("kommando",KIcon::SizeLarge),"Menu"); new TQListBoxPixmap(listBox,MainBarIcon("kommando",TDEIcon::SizeLarge),"Menu");
new TQListBoxPixmap(listBox,MainBarIcon("configure_shortcuts",KIcon::SizeLarge),"Shortcuts"); new TQListBoxPixmap(listBox,MainBarIcon("configure_shortcuts",TDEIcon::SizeLarge),"Shortcuts");
new TQListBoxPixmap(listBox,MainBarIcon("colors",KIcon::SizeLarge),"Appearance"); new TQListBoxPixmap(listBox,MainBarIcon("colors",TDEIcon::SizeLarge),"Appearance");
listBox->setSelected(listBox->topItem(),true); listBox->setSelected(listBox->topItem(),true);
connect(kKeyButton1,SIGNAL(capturedShortcut(const KShortcut&)),this,SLOT(slotShortcutChanged(const KShortcut&)) ); connect(kKeyButton1,SIGNAL(capturedShortcut(const TDEShortcut&)),this,SLOT(slotShortcutChanged(const TDEShortcut&)) );
addService->setPopup(new ServiceMenu(this, SLOT(slotAddService(KService*)), addService->setPopup(new ServiceMenu(this, SLOT(slotAddService(KService*)),
SLOT(slotAddServiceGroup(KServiceGroup*)), addService)); SLOT(slotAddServiceGroup(KServiceGroup*)), addService));
@ -362,7 +362,7 @@ void ConfigDialogImpl::slotApplyClicked()
setChanged(false); setChanged(false);
} }
void ConfigDialogImpl::slotShortcutChanged(const KShortcut & cut ) void ConfigDialogImpl::slotShortcutChanged(const TDEShortcut & cut )
{ {
if(!KKeyChooser::checkGlobalShortcutsConflict(cut,true,this)){ if(!KKeyChooser::checkGlobalShortcutsConflict(cut,true,this)){
kKeyButton1->setText(cut.toString()); kKeyButton1->setText(cut.toString());

4
src/configdialogimpl.h
Unescape View File

@ -33,7 +33,7 @@
class KService; class KService;
class KServiceGroup; class KServiceGroup;
class KShortcut; class TDEShortcut;
/** /**
* @short Application Main Window * @short Application Main Window
@ -78,7 +78,7 @@ class ConfigDialogImpl : public ConfigDialog
virtual void slotCustomSizeCheckboxToggled(bool); virtual void slotCustomSizeCheckboxToggled(bool);
virtual void slotSchemeComboboxChanged(const TQString&); virtual void slotSchemeComboboxChanged(const TQString&);
virtual void slotMenuRadiusSpinboxChanged(int); virtual void slotMenuRadiusSpinboxChanged(int);
virtual void slotShortcutChanged(const KShortcut& cut); virtual void slotShortcutChanged(const TDEShortcut& cut);
virtual void slotCommandoTyped(const TQString& commando); virtual void slotCommandoTyped(const TQString& commando);
virtual void slotMenuViewClicked(TQListViewItem* item); virtual void slotMenuViewClicked(TQListViewItem* item);
virtual void slotNewIcon(); virtual void slotNewIcon();

4
src/configuration.cpp
Unescape View File

@ -37,7 +37,7 @@ Config::Config()
kdDebug() << "kommandorc located: " << mConfigPath << endl; kdDebug() << "kommandorc located: " << mConfigPath << endl;
if (mConfigPath.isNull() || !TQFile::exists(mConfigPath)){ //test for new config file if (mConfigPath.isNull() || !TQFile::exists(mConfigPath)){ //test for new config file
kdDebug() << "There is no kommandorc in kdedirs" << endl; kdDebug() << "There is no kommandorc in tdedirs" << endl;
mConfigPath = locateLocal("data", "kommando/kommandorc"); mConfigPath = locateLocal("data", "kommando/kommandorc");
if(TQFile::exists(KShell::homeDir("")+"/.kommandorc")){ //tries old config file if(TQFile::exists(KShell::homeDir("")+"/.kommandorc")){ //tries old config file
@ -222,7 +222,7 @@ void Config::toKommandoMenu(Kommando* buttonParent)
if(it != defaultMenu){ if(it != defaultMenu){
SubmenuButton* button = new SubmenuButton(buttonParent,defaultMenu,mMenuButtonSize); SubmenuButton* button = new SubmenuButton(buttonParent,defaultMenu,mMenuButtonSize);
button->hide(); button->hide();
button->setIcon("up"); button->setIcon("go-up");
//This registers the button with the Menu, but does not add it to its child List //This registers the button with the Menu, but does not add it to its child List
//Doing so would cause the menu to delete the default menu, which already deletes itsself //Doing so would cause the menu to delete the default menu, which already deletes itsself
it->insertNoChild(button); it->insertNoChild(button);

16
src/kcmkommando.cpp
Unescape View File

@ -21,10 +21,10 @@
#include <ntqlayout.h> #include <ntqlayout.h>
#include <klocale.h> #include <tdelocale.h>
#include <kglobal.h> #include <tdeglobal.h>
#include <kparts/genericfactory.h> #include <tdeparts/genericfactory.h>
#include <kaboutdata.h> #include <tdeaboutdata.h>
#include "kcmkommando.h" #include "kcmkommando.h"
#include "configdialogimpl.h" #include "configdialogimpl.h"
@ -39,10 +39,10 @@ typedef KGenericFactory<KCMKommando, TQWidget> kommandoFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_kommando, kommandoFactory("kcmkommando")) K_EXPORT_COMPONENT_FACTORY( kcm_kommando, kommandoFactory("kcmkommando"))
KCMKommando::KCMKommando(TQWidget *parent, const char *name, const TQStringList&) KCMKommando::KCMKommando(TQWidget *parent, const char *name, const TQStringList&)
: KCModule(parent, name), about(0), configDialog(0) : TDECModule(parent, name), about(0), configDialog(0)
{ {
about = new KAboutData("kommando", I18N_NOOP("Kommando"), version, description, about = new TDEAboutData("kommando", I18N_NOOP("Kommando"), version, description,
KAboutData::License_GPL, "(C) 2005 Daniel Stöckel", 0, 0, "the_docter@gmx.net"); TDEAboutData::License_GPL, "(C) 2005 Daniel Stöckel", 0, 0, "the_docter@gmx.net");
about->addAuthor( "Daniel Stöckel", 0, "the_docter@gmx.net" ); about->addAuthor( "Daniel Stöckel", 0, "the_docter@gmx.net" );
about->addAuthor( "Sergio Cambra", 0, "runico@users.berlios.de" ); about->addAuthor( "Sergio Cambra", 0, "runico@users.berlios.de" );
setAboutData(about); setAboutData(about);
@ -85,7 +85,7 @@ void KCMKommando::save()
int KCMKommando::buttons() int KCMKommando::buttons()
{ {
return KCModule::Default|KCModule::Apply|KCModule::Help; return TDECModule::Default|TDECModule::Apply|TDECModule::Help;
} }

10
src/kcmkommando.h
Unescape View File

@ -22,12 +22,12 @@
#ifndef _PRUEBA_H_ #ifndef _PRUEBA_H_
#define _PRUEBA_H_ #define _PRUEBA_H_
#include <kcmodule.h> #include <tdecmodule.h>
class ConfigDialogImpl; class ConfigDialogImpl;
class KAboutData; class TDEAboutData;
class KCMKommando: public KCModule class KCMKommando: public TDECModule
{ {
Q_OBJECT Q_OBJECT
@ -40,13 +40,13 @@ public:
virtual void defaults(); virtual void defaults();
virtual int buttons(); virtual int buttons();
virtual TQString quickHelp() const; virtual TQString quickHelp() const;
virtual const KAboutData *aboutData()const { return about; }; virtual const TDEAboutData *aboutData()const { return about; };
protected slots: protected slots:
void configChanged(bool state) { emit changed(state); } void configChanged(bool state) { emit changed(state); }
private: private:
KAboutData *about; TDEAboutData *about;
ConfigDialogImpl *configDialog; ConfigDialogImpl *configDialog;
}; };

4
src/kommando.cpp
Unescape View File

@ -19,7 +19,7 @@
***************************************************************************/ ***************************************************************************/
#include "kommando.h" #include "kommando.h"
#include <klocale.h> #include <tdelocale.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xmu/WinUtil.h> #include <X11/Xmu/WinUtil.h>
#include <kpixmapeffect.h> #include <kpixmapeffect.h>
@ -213,7 +213,7 @@ void Kommando::slotButtonSelected( int type )
} }
break; break;
case RoundButton::Commando: case RoundButton::Commando:
navbutton.setIcon("exec"); navbutton.setIcon("application-x-executable");
break; break;
case RoundButton::Submenu: case RoundButton::Submenu:
navbutton.setIcon("folder"); navbutton.setIcon("folder");

12
src/kommando.desktop
Unescape View File

@ -1,14 +1,14 @@
[Desktop Entry] [Desktop Entry]
Encoding=UTF-8 Encoding=UTF-8
Name=Kommando Name=Kommando
Exec=kcmshell kommando Exec=tdecmshell kommando
Icon=kommando Icon=kommando
Type=Application Type=Application
Categories=Qt;KDE;X-KDE-settings-desktop; Categories=Qt;TDE;X-TDE-settings-desktop;
Keywords=Kommando,wheel,menu Keywords=Kommando;wheel;menu
X-KDE-ModuleType=Library X-TDE-ModuleType=Library
X-KDE-Library=kommando X-TDE-Library=kommando
X-KDE-ParentApp=kcontrol X-TDE-ParentApp=kcontrol
Comment=A WheelMenu for KDE Comment=A WheelMenu for KDE
Comment[de]=Ein Kreismenü für KDE Comment[de]=Ein Kreismenü für KDE

2
src/kommando.h
Unescape View File

@ -58,7 +58,7 @@ class Kommando : public TQWidget
virtual void resize(); virtual void resize();
public slots: public slots:
//Slot for KGlobalAccel //Slot for TDEGlobalAccel
virtual void slotGlobAccel(); virtual void slotGlobAccel();
protected: protected:

4
src/kommandod.cpp
Unescape View File

@ -20,7 +20,7 @@
#include <ntqmessagebox.h> #include <ntqmessagebox.h>
#include <ntqdir.h> #include <ntqdir.h>
#include <klocale.h> #include <tdelocale.h>
#include <ntqmessagebox.h> #include <ntqmessagebox.h>
#include <kdebug.h> #include <kdebug.h>
@ -38,7 +38,7 @@ KommandoDaemon::KommandoDaemon(const TQCString &name)
Shortcut.insert("Toggle", i18n("Toggle"), Shortcut.insert("Toggle", i18n("Toggle"),
i18n("This shortcut toggles the visibility of the Kommando menu"), i18n("This shortcut toggles the visibility of the Kommando menu"),
KShortcut(config.Shortcut()), KShortcut(config.Shortcut()), TDEShortcut(config.Shortcut()), TDEShortcut(config.Shortcut()),
kommandoWin, SLOT( slotGlobAccel() ) ); kommandoWin, SLOT( slotGlobAccel() ) );
Shortcut.setEnabled(true); Shortcut.setEnabled(true);
Shortcut.updateConnections(); Shortcut.updateConnections();

12
src/kommandod.desktop
Unescape View File

@ -2,12 +2,12 @@
Encoding=UTF-8 Encoding=UTF-8
Type=Service Type=Service
ServiceTypes=KDEDModule X-TDE-ServiceTypes=KDEDModule
X-KDE-ModuleType=Library X-TDE-ModuleType=Library
X-KDE-Library=kommandod X-TDE-Library=kommandod
X-KDE-Factory=kommandod X-TDE-Factory=kommandod
X-KDE-Kded-autoload=true X-TDE-Kded-autoload=true
X-KDE-Kded-load-on-demand=false X-TDE-Kded-load-on-demand=false
Name=Kommando Name=Kommando
Comment=A WheelMenu for KDE Comment=A WheelMenu for KDE

2
src/kommandod.h
Unescape View File

@ -47,7 +47,7 @@ class KommandoDaemon : public KDEDModule
virtual void reparseConfiguration(); virtual void reparseConfiguration();
protected: protected:
KGlobalAccel Shortcut; TDEGlobalAccel Shortcut;
Kommando *kommandoWin; Kommando *kommandoWin;
}; };

4
src/roundbutton.cpp
Unescape View File

@ -104,9 +104,9 @@ bool RoundButton::event( TQEvent * evt )
void RoundButton::setActive( bool mode ) void RoundButton::setActive( bool mode )
{ {
if(mode){ if(mode){
setPixmap(mEffect.apply(icon,KIcon::Desktop,KIcon::ActiveState)); setPixmap(mEffect.apply(icon,TDEIcon::Desktop,TDEIcon::ActiveState));
} else { } else {
setPixmap(mEffect.apply(icon,KIcon::Desktop,KIcon::DefaultState)); setPixmap(mEffect.apply(icon,TDEIcon::Desktop,TDEIcon::DefaultState));
} }
} }

2
src/roundbutton.h
Unescape View File

@ -60,7 +60,7 @@ class RoundButton : public TQButton //well, there were round buttons in the beg
TQPixmap icon; TQPixmap icon;
TQString mIconPath; TQString mIconPath;
KPixmap background; KPixmap background;
KIconEffect mEffect; TDEIconEffect mEffect;
virtual void keyPressEvent(TQKeyEvent* evt); virtual void keyPressEvent(TQKeyEvent* evt);

26
src/servicemenu.cpp
Unescape View File

@ -19,17 +19,17 @@
***************************************************************************/ ***************************************************************************/
#include "servicemenu.h" #include "servicemenu.h"
#include <kglobal.h> #include <tdeglobal.h>
#include <klocale.h> #include <tdelocale.h>
#include <ntqimage.h> #include <ntqimage.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kservicegroup.h> #include <kservicegroup.h>
#include <ksycoca.h> #include <tdesycoca.h>
#include <kdebug.h> #include <kdebug.h>
ServiceMenu::ServiceMenu(TQObject *receiver, const char *slotActivatedItem, ServiceMenu::ServiceMenu(TQObject *receiver, const char *slotActivatedItem,
const char *slotActivatedGroup, TQWidget *parent, const char *name) const char *slotActivatedGroup, TQWidget *parent, const char *name)
: KPopupMenu(parent, name), m_relPath(TQString::null), : TDEPopupMenu(parent, name), m_relPath(TQString::null),
m_receiver(receiver), m_slotActivatedItem(slotActivatedItem), m_receiver(receiver), m_slotActivatedItem(slotActivatedItem),
m_slotActivatedGroup(slotActivatedGroup) m_slotActivatedGroup(slotActivatedGroup)
{ {
@ -38,7 +38,7 @@ ServiceMenu::ServiceMenu(TQObject *receiver, const char *slotActivatedItem,
ServiceMenu::ServiceMenu(const TQString & relPath, TQObject *receiver, const char *slotActivatedItem, ServiceMenu::ServiceMenu(const TQString & relPath, TQObject *receiver, const char *slotActivatedItem,
const char *slotActivatedGroup, TQWidget *parent, const char *name) const char *slotActivatedGroup, TQWidget *parent, const char *name)
: KPopupMenu(parent, name), m_relPath(relPath), : TDEPopupMenu(parent, name), m_relPath(relPath),
m_receiver(receiver), m_slotActivatedItem(slotActivatedItem), m_receiver(receiver), m_slotActivatedItem(slotActivatedItem),
m_slotActivatedGroup(slotActivatedGroup) m_slotActivatedGroup(slotActivatedGroup)
{ {
@ -132,10 +132,10 @@ void ServiceMenu::createMenu()
TQIconSet ServiceMenu::getIconSet(const TQString& icon) const TQIconSet ServiceMenu::getIconSet(const TQString& icon) const
{ {
TQIconSet iconset; TQIconSet iconset;
TQPixmap normal = KGlobal::instance()->iconLoader()->loadIcon( TQPixmap normal = TDEGlobal::instance()->iconLoader()->loadIcon(
icon, KIcon::Small, 0, KIcon::DefaultState, 0L, true); icon, TDEIcon::Small, 0, TDEIcon::DefaultState, 0L, true);
TQPixmap active = KGlobal::instance()->iconLoader()->loadIcon( TQPixmap active = TDEGlobal::instance()->iconLoader()->loadIcon(
icon, KIcon::Small, 0, KIcon::ActiveState, 0L, true); icon, TDEIcon::Small, 0, TDEIcon::ActiveState, 0L, true);
// make sure they are not larger than 20x20 // make sure they are not larger than 20x20
if (normal.width() > 20 || normal.height() > 20) if (normal.width() > 20 || normal.height() > 20)
@ -184,10 +184,10 @@ void ServiceMenu::insertMenuItem(KService::Ptr & s,
serviceName.replace("&", "&&"); serviceName.replace("&", "&&");
TQIconSet iconset; TQIconSet iconset;
TQPixmap normal = KGlobal::instance()->iconLoader()->loadIcon( TQPixmap normal = TDEGlobal::instance()->iconLoader()->loadIcon(
s->icon(), KIcon::Small, 0, KIcon::DefaultState, 0L, true); s->icon(), TDEIcon::Small, 0, TDEIcon::DefaultState, 0L, true);
TQPixmap active = KGlobal::instance()->iconLoader()->loadIcon( TQPixmap active = TDEGlobal::instance()->iconLoader()->loadIcon(
s->icon(), KIcon::Small, 0, KIcon::ActiveState, 0L, true); s->icon(), TDEIcon::Small, 0, TDEIcon::ActiveState, 0L, true);
// make sure they are not larger than 20x20 // make sure they are not larger than 20x20
if (normal.width() > 20 || normal.height() > 20) if (normal.width() > 20 || normal.height() > 20)

6
src/servicemenu.h
Unescape View File

@ -21,8 +21,8 @@
#ifndef SERVICEMENU_H #ifndef SERVICEMENU_H
#define SERVICEMENU_H #define SERVICEMENU_H
#include <kpopupmenu.h> #include <tdepopupmenu.h>
#include <ksycocaentry.h> #include <tdesycocaentry.h>
#include <kservice.h> #include <kservice.h>
class KServiceGroup; class KServiceGroup;
@ -30,7 +30,7 @@ class KServiceGroup;
/** /**
@author Sergio Cambra @author Sergio Cambra
*/ */
class ServiceMenu : public KPopupMenu class ServiceMenu : public TDEPopupMenu
{ {
Q_OBJECT Q_OBJECT
public: public:

Write Preview
Loading…
Cancel
Save