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

KDE3->TDE conversion

Browse Source 
Signed-off-by: Mavridis Philippe <mavridisf@gmail.com>
pull/1/head
Mavridis Philippe 4 years ago
parent d991b7f387
commit 29129afdb2
No known key found for this signature in database
GPG Key ID: F8D2D7E2F989A494
40 changed files with 984 additions and 984 deletions
Show Stats Download Patch File Download Diff File

22
Makefile.in
Unescape View File

@ -155,18 +155,18 @@ LIBZ = @LIBZ@
LIB_IMLIB2 = @LIB_IMLIB2@ LIB_IMLIB2 = @LIB_IMLIB2@
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_KFILE = @LIB_KFILE@ LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@ LIB_KFM = @LIB_KFM@
LIB_KHTML = @LIB_KHTML@ LIB_TDEHTML = @LIB_TDEHTML@
LIB_KIO = @LIB_KIO@ LIB_TDEIO = @LIB_TDEIO@
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@
@ -275,7 +275,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@

228
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!
@ -360,24 +360,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)
@ -543,11 +543,11 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
AM_CONDITIONAL(include_ARTS, test "$build_arts" != "no") AM_CONDITIONAL(include_ARTS, test "$build_arts" != "no")
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
@ -559,7 +559,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)]) KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)])
KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)]) KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)])
fi fi
KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs]) KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs])
KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs]) KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
kde32ornewer=1 kde32ornewer=1
@ -572,14 +572,14 @@ 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
KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [XMLLINT=""]) KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/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=""
@ -609,9 +609,9 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
if test -x "$KDECONFIG"; then # it can be "compiled" if test -x "$KDECONFIG"; then # it can be "compiled"
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`
@ -693,7 +693,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
@ -910,7 +910,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
@ -1394,7 +1394,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
]) ])
@ -1435,7 +1435,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
@ -1619,7 +1619,7 @@ 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([you need to install kdelibs first.]) AC_MSG_ERROR([you need to install tdelibs first.])
fi fi
fi fi
]) ])
@ -1730,16 +1730,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="/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="/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"
@ -1750,15 +1750,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="/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="/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([
@ -1766,10 +1766,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
@ -1924,20 +1924,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");
@ -1975,7 +1975,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([
@ -2008,39 +2008,39 @@ 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_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")
# 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
]) ])
@ -2105,7 +2105,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
@ -2386,7 +2386,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
]) ])
@ -2450,7 +2450,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
@ -3066,26 +3066,26 @@ AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch config
AC_DEFUN([KDE_CHECK_LIB64], AC_DEFUN([KDE_CHECK_LIB64],
[ [
kdelibsuff=no tdelibsuff=no
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
]) ])
@ -3102,7 +3102,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
@ -4076,7 +4076,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)
@ -4465,8 +4465,8 @@ AC_DEFUN([KDE_CONF_FILES],
AC_DEFUN([KDE_SET_PREFIX], AC_DEFUN([KDE_SET_PREFIX],
[ [
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
@ -5116,7 +5116,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
@ -5136,7 +5136,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

314
autom4te.cache/output.0
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:-/usr/local/kde} ac_default_prefix=${TDEDIR:-/usr/local/kde}
# 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 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 USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS 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 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 KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG KDECONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_libs_prefix kde_libs_htmldir 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_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KSYCOCA LIB_KFILE LIB_KFM LIB_XDAMAGE LIB_XCOMPOSITE LIB_IMLIB2 IMLIB2_CFLAGS TOPSUBDIRS LIB@&t@OBJS 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 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 USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS 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 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 KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG KDECONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_libs_prefix kde_libs_htmldir 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_SMB LIB_KAB LIB_KABC LIB_TDEHTML LIB_TDESPELL LIB_TDEPARTS LIB_TDEPRINT LIB_TDEUTILS LIB_TDEPIM LIB_TDESYCOCA LIB_KFILE LIB_KFM LIB_XDAMAGE LIB_XCOMPOSITE LIB_IMLIB2 IMLIB2_CFLAGS TOPSUBDIRS LIB@&t@OBJS LTLIBOBJS'
ac_subst_files='' ac_subst_files=''
# Initialize some variables set by options. # Initialize some variables set by options.
@ -6312,18 +6312,18 @@ fi;
kdelibsuff=no tdelibsuff=no
# 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
@ -6333,16 +6333,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.
@ -21517,7 +21517,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
@ -21737,7 +21737,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
@ -26989,41 +26989,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
@ -27082,7 +27082,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
@ -28416,7 +28416,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;
@ -28480,7 +28480,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
@ -29277,16 +29277,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="/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="/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
@ -29315,8 +29315,8 @@ So, check this please and use another prefix!" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
kde_libdirs="/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="/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
@ -29340,7 +29340,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: __oline__: $i/$j" >&5 echo "configure: __oline__: $i/$j" >&5
if test -r "$i/$j"; then if test -r "$i/$j"; then
@ -29362,13 +29362,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
@ -29501,8 +29501,8 @@ fi
echo "$as_me:$LINENO: result: $kde_cv_uic_plugins" >&5 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: you need to install kdelibs first." >&5 { { echo "$as_me:$LINENO: error: you need to install tdelibs first." >&5
echo "$as_me: error: you need to install kdelibs first." >&2;} echo "$as_me: error: you need to install tdelibs first." >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
fi fi
@ -29675,20 +29675,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");
@ -29751,7 +29751,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
@ -29763,22 +29763,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
@ -29978,20 +29978,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");
@ -30054,7 +30054,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
@ -30066,22 +30066,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
@ -30182,11 +30182,11 @@ fi
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
@ -30463,12 +30463,12 @@ echo "${ECHO_T}$kde_cv_path" >&6
fi fi
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
@ -30484,16 +30484,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
@ -30590,12 +30590,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
@ -30611,16 +30611,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
@ -30640,10 +30640,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; }; }
@ -30783,7 +30783,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;
@ -30827,13 +30827,13 @@ done
if test -x "$KDECONFIG"; then # it can be "compiled" if test -x "$KDECONFIG"; then # it can be "compiled"
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
@ -30867,7 +30867,7 @@ echo "$as_me: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_
kdeinitdir='$(kde_moduledir)' tdeinitdir='$(kde_moduledir)'
@ -30885,68 +30885,68 @@ 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_SMB="-lsmb" LIB_SMB="-lsmb"
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"
# 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
@ -32445,22 +32445,22 @@ 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_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_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,@LIB_XDAMAGE@,$LIB_XDAMAGE,;t t s,@LIB_XDAMAGE@,$LIB_XDAMAGE,;t t
@ -33190,13 +33190,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

314
autom4te.cache/output.1
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:-/usr/local/kde} ac_default_prefix=${TDEDIR:-/usr/local/kde}
# 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 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 USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS 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 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 KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG KDECONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_libs_prefix kde_libs_htmldir 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_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KSYCOCA LIB_KFILE LIB_KFM LIB_XDAMAGE LIB_XCOMPOSITE LIB_IMLIB2 IMLIB2_CFLAGS TOPSUBDIRS LIB@&t@OBJS 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 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 USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS 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 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 KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG KDECONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_libs_prefix kde_libs_htmldir 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_SMB LIB_KAB LIB_KABC LIB_TDEHTML LIB_TDESPELL LIB_TDEPARTS LIB_TDEPRINT LIB_TDEUTILS LIB_TDEPIM LIB_TDESYCOCA LIB_KFILE LIB_KFM LIB_XDAMAGE LIB_XCOMPOSITE LIB_IMLIB2 IMLIB2_CFLAGS TOPSUBDIRS LIB@&t@OBJS LTLIBOBJS'
ac_subst_files='' ac_subst_files=''
# Initialize some variables set by options. # Initialize some variables set by options.
@ -6312,18 +6312,18 @@ fi;
kdelibsuff=no tdelibsuff=no
# 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
@ -6333,16 +6333,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.
@ -21517,7 +21517,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
@ -21737,7 +21737,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
@ -26989,41 +26989,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
@ -27082,7 +27082,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
@ -28416,7 +28416,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;
@ -28480,7 +28480,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
@ -29277,16 +29277,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="/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="/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
@ -29315,8 +29315,8 @@ So, check this please and use another prefix!" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
kde_libdirs="/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="/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
@ -29340,7 +29340,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: __oline__: $i/$j" >&5 echo "configure: __oline__: $i/$j" >&5
if test -r "$i/$j"; then if test -r "$i/$j"; then
@ -29362,13 +29362,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
@ -29501,8 +29501,8 @@ fi
echo "$as_me:$LINENO: result: $kde_cv_uic_plugins" >&5 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: you need to install kdelibs first." >&5 { { echo "$as_me:$LINENO: error: you need to install tdelibs first." >&5
echo "$as_me: error: you need to install kdelibs first." >&2;} echo "$as_me: error: you need to install tdelibs first." >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
fi fi
@ -29675,20 +29675,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");
@ -29751,7 +29751,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
@ -29763,22 +29763,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
@ -29978,20 +29978,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");
@ -30054,7 +30054,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
@ -30066,22 +30066,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
@ -30182,11 +30182,11 @@ fi
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
@ -30463,12 +30463,12 @@ echo "${ECHO_T}$kde_cv_path" >&6
fi fi
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
@ -30484,16 +30484,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
@ -30590,12 +30590,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
@ -30611,16 +30611,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
@ -30640,10 +30640,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; }; }
@ -30783,7 +30783,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;
@ -30827,13 +30827,13 @@ done
if test -x "$KDECONFIG"; then # it can be "compiled" if test -x "$KDECONFIG"; then # it can be "compiled"
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
@ -30867,7 +30867,7 @@ echo "$as_me: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_
kdeinitdir='$(kde_moduledir)' tdeinitdir='$(kde_moduledir)'
@ -30885,68 +30885,68 @@ 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_SMB="-lsmb" LIB_SMB="-lsmb"
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"
# 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
@ -32445,22 +32445,22 @@ 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_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_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,@LIB_XDAMAGE@,$LIB_XDAMAGE,;t t s,@LIB_XDAMAGE@,$LIB_XDAMAGE,;t t
@ -33190,13 +33190,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

286
autom4te.cache/traces.0
Unescape View File

@ -563,41 +563,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!
@ -792,24 +792,24 @@ m4trace:acinclude.m4:385: -1- 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)
@ -963,11 +963,11 @@ m4trace:acinclude.m4:624: -1- AC_DEFUN([KDE_SUBST_PROGRAMS], [
AM_CONDITIONAL(include_ARTS, test "$build_arts" != "no") AM_CONDITIONAL(include_ARTS, test "$build_arts" != "no")
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
@ -979,7 +979,7 @@ m4trace:acinclude.m4:624: -1- AC_DEFUN([KDE_SUBST_PROGRAMS], [
KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)]) KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)])
KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)]) KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)])
fi fi
KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs]) KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs])
KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs]) KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
kde32ornewer=1 kde32ornewer=1
@ -992,14 +992,14 @@ m4trace:acinclude.m4:624: -1- 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
KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [XMLLINT=""]) KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/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=""
@ -1029,9 +1029,9 @@ m4trace:acinclude.m4:624: -1- AC_DEFUN([KDE_SUBST_PROGRAMS], [
if test -x "$KDECONFIG"; then # it can be "compiled" if test -x "$KDECONFIG"; then # it can be "compiled"
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`
@ -1109,7 +1109,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
@ -1317,7 +1317,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
@ -1787,7 +1787,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
]) ])
@ -1828,7 +1828,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
@ -2008,7 +2008,7 @@ 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([you need to install kdelibs first.]) AC_MSG_ERROR([you need to install tdelibs first.])
fi fi
fi fi
]) ])
@ -2104,16 +2104,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="/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="/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"
@ -2124,15 +2124,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="/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="/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([
@ -2140,10 +2140,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
@ -2294,20 +2294,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");
@ -2343,7 +2343,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([
@ -2374,39 +2374,39 @@ m4trace:acinclude.m4:2045: -1- 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_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")
# 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
]) ])
m4trace:acinclude.m4:2069: -1- AC_DEFUN([AC_PATH_KDE], [ m4trace:acinclude.m4:2069: -1- AC_DEFUN([AC_PATH_KDE], [
@ -2466,7 +2466,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
@ -2719,7 +2719,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
]) ])
m4trace:acinclude.m4:2433: -1- AC_DEFUN([KDE_FIND_JPEG_HELPER], [ m4trace:acinclude.m4:2433: -1- AC_DEFUN([KDE_FIND_JPEG_HELPER], [
@ -2779,7 +2779,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
@ -3358,26 +3358,26 @@ AC_SUBST(KDE_PLUGIN)
AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch configure') AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch configure')
]) ])
m4trace:acinclude.m4:3090: -1- AC_DEFUN([KDE_CHECK_LIB64], [ m4trace:acinclude.m4:3090: -1- AC_DEFUN([KDE_CHECK_LIB64], [
kdelibsuff=no tdelibsuff=no
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
]) ])
m4trace:acinclude.m4:3097: -1- AC_DEFUN([KDE_CHECK_TYPES], [ AC_CHECK_SIZEOF(int, 4)dnl m4trace:acinclude.m4:3097: -1- AC_DEFUN([KDE_CHECK_TYPES], [ AC_CHECK_SIZEOF(int, 4)dnl
@ -3390,7 +3390,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
@ -4271,7 +4271,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)
@ -4621,8 +4621,8 @@ m4trace:acinclude.m4:4463: -1- AC_DEFUN([KDE_CONF_FILES], [
]) ])
m4trace:acinclude.m4:4480: -1- AC_DEFUN([KDE_SET_PREFIX], [ m4trace:acinclude.m4:4480: -1- AC_DEFUN([KDE_SET_PREFIX], [
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
@ -5156,7 +5156,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
@ -5176,7 +5176,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
@ -16111,7 +16111,7 @@ autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
acinclude.m4:1857: AC_BASE_PATH_KDE is expanded from... acinclude.m4:1857: AC_BASE_PATH_KDE is expanded from...
acinclude.m4:2069: AC_PATH_KDE is expanded from... acinclude.m4:2069: AC_PATH_KDE is expanded from...
configure.in:61: the top level]) configure.in:61: the top level])
m4trace:configure.in:61: -1- AC_FIND_FILE(["kde3/plugins/designer/kdewidgets.la"], [$kde_libdirs], [kde_widgetdir]) m4trace:configure.in:61: -1- AC_FIND_FILE(["kde3/plugins/designer/tdewidgets.la"], [$kde_libdirs], [kde_widgetdir])
m4trace:configure.in:61: -1- _m4_warn([obsolete], [The macro `AC_FD_CC' is obsolete. m4trace:configure.in:61: -1- _m4_warn([obsolete], [The macro `AC_FD_CC' is obsolete.
You should run autoupdate.], [autoconf/general.m4:376: AC_FD_CC is expanded from... You should run autoupdate.], [autoconf/general.m4:376: AC_FD_CC is expanded from...
acinclude.m4:174: AC_FIND_FILE is expanded from... acinclude.m4:174: AC_FIND_FILE is expanded from...
@ -16260,10 +16260,10 @@ m4trace:configure.in:61: -1- KDE_FIND_PATH([mcopidl], [MCOPIDL], [$kde_default_b
m4trace:configure.in:61: -1- KDE_MISSING_ARTS_ERROR([mcopidl]) m4trace:configure.in:61: -1- KDE_MISSING_ARTS_ERROR([mcopidl])
m4trace:configure.in:61: -1- KDE_FIND_PATH([artsc-config], [ARTSCCONFIG], [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)]) m4trace:configure.in:61: -1- KDE_FIND_PATH([artsc-config], [ARTSCCONFIG], [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)])
m4trace:configure.in:61: -1- KDE_MISSING_ARTS_ERROR([artsc-config]) m4trace:configure.in:61: -1- KDE_MISSING_ARTS_ERROR([artsc-config])
m4trace:configure.in:61: -1- KDE_FIND_PATH([kde-config], [KDECONFIG], [$kde_default_bindirs]) m4trace:configure.in:61: -1- KDE_FIND_PATH([tde-config], [KDECONFIG], [$kde_default_bindirs])
m4trace:configure.in:61: -1- KDE_FIND_PATH([meinproc], [MEINPROC], [$kde_default_bindirs]) m4trace:configure.in:61: -1- KDE_FIND_PATH([meinproc], [MEINPROC], [$kde_default_bindirs])
m4trace:configure.in:61: -1- KDE_FIND_PATH([kconfig_compiler], [KCONFIG_COMPILER], [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)]) m4trace:configure.in:61: -1- KDE_FIND_PATH([tdeconfig_compiler], [KCONFIG_COMPILER], [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
m4trace:configure.in:61: -1- KDE_MISSING_PROG_ERROR([kconfig_compiler]) m4trace:configure.in:61: -1- KDE_MISSING_PROG_ERROR([tdeconfig_compiler])
m4trace:configure.in:61: -1- KDE_FIND_PATH([dcopidlng], [DCOPIDLNG], [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) m4trace:configure.in:61: -1- KDE_FIND_PATH([dcopidlng], [DCOPIDLNG], [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
m4trace:configure.in:61: -1- KDE_MISSING_PROG_ERROR([dcopidlng]) m4trace:configure.in:61: -1- KDE_MISSING_PROG_ERROR([dcopidlng])
m4trace:configure.in:61: -1- KDE_FIND_PATH([xmllint], [XMLLINT], [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [XMLLINT=""]) m4trace:configure.in:61: -1- KDE_FIND_PATH([xmllint], [XMLLINT], [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [XMLLINT=""])
@ -16315,40 +16315,40 @@ m4trace:configure.in:61: -1- AC_SUBST([kde_templatesdir])
m4trace:configure.in:61: -1- AC_SUBST([kde_servicesdir]) m4trace:configure.in:61: -1- AC_SUBST([kde_servicesdir])
m4trace:configure.in:61: -1- AC_SUBST([kde_servicetypesdir]) m4trace:configure.in:61: -1- AC_SUBST([kde_servicetypesdir])
m4trace:configure.in:61: -1- AC_SUBST([kde_moduledir]) m4trace:configure.in:61: -1- AC_SUBST([kde_moduledir])
m4trace:configure.in:61: -1- AC_SUBST([kdeinitdir], ['$(kde_moduledir)']) m4trace:configure.in:61: -1- AC_SUBST([tdeinitdir], ['$(kde_moduledir)'])
m4trace:configure.in:61: -1- AC_SUBST([kde_styledir]) m4trace:configure.in:61: -1- AC_SUBST([kde_styledir])
m4trace:configure.in:61: -1- AC_SUBST([kde_widgetdir]) m4trace:configure.in:61: -1- AC_SUBST([kde_widgetdir])
m4trace:configure.in:61: -1- KDE_CREATE_LIBS_ALIASES m4trace:configure.in:61: -1- KDE_CREATE_LIBS_ALIASES
m4trace:configure.in:61: -1- AC_SUBST([LIB_KDECORE], ["-lkdecore"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_TDECORE], ["-ltdecore"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KDEUI], ["-lkdeui"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEUI], ["-ltdeui"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KIO], ["-lkio"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEIO], ["-ltdeio"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_SMB], ["-lsmb"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_SMB], ["-lsmb"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KAB], ["-lkab"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_KAB], ["-lkab"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KABC], ["-lkabc"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_KABC], ["-ltdeabc"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KHTML], ["-lkhtml"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEHTML], ["-ltdehtml"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KSPELL], ["-lkspell"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_TDESPELL], ["-ltdespell"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KPARTS], ["-lkparts"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEPARTS], ["-ltdeparts"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KDEPRINT], ["-lkdeprint"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEPRINT], ["-ltdeprint"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KUTILS], ["-lkutils"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEUTILS], ["-ltdeutils"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KDEPIM], ["-lkdepim"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEPIM], ["-ltdepim"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KSYCOCA], ["-lkio"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_TDESYCOCA], ["-ltdeio"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KFILE], ["-lkio"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_KFILE], ["-ltdeio"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KDECORE], ["-lkdecore"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_TDECORE], ["-ltdecore"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KDEUI], ["-lkdeui"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEUI], ["-ltdeui"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KIO], ["-lkio"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEIO], ["-ltdeio"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KSYCOCA], ["-lksycoca"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_TDESYCOCA], ["-ltdesycoca"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_SMB], ["-lsmb"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_SMB], ["-lsmb"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KFILE], ["-lkfile"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_KFILE], ["-ltdefile"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KAB], ["-lkab"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_KAB], ["-lkab"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KHTML], ["-lkhtml"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEHTML], ["-ltdehtml"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KSPELL], ["-lkspell"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_TDESPELL], ["-ltdespell"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KPARTS], ["-lkparts"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEPARTS], ["-ltdeparts"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KDEPRINT], ["-lkdeprint"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEPRINT], ["-ltdeprint"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KDECORE], ["-lkdecore -lXext $(LIB_QT)"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_TDECORE], ["-ltdecore -lXext $(LIB_QT)"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KDEUI], ["-lkdeui $(LIB_KDECORE)"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEUI], ["-ltdeui $(LIB_TDECORE)"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KFM], ["-lkfm $(LIB_KDECORE)"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_KFM], ["-lkfm $(LIB_TDECORE)"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KFILE], ["-lkfile $(LIB_KFM) $(LIB_KDEUI)"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_KFILE], ["-ltdefile $(LIB_KFM) $(LIB_TDEUI)"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KAB], ["-lkab $(LIB_KIMGIO) $(LIB_KDECORE)"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_KAB], ["-lkab $(LIB_KIMGIO) $(LIB_TDECORE)"])
m4trace:configure.in:70: -1- AC_DEFINE_TRACE_LITERAL([WORDS_BIGENDIAN]) m4trace:configure.in:70: -1- AC_DEFINE_TRACE_LITERAL([WORDS_BIGENDIAN])
m4trace:configure.in:70: -1- AH_OUTPUT([WORDS_BIGENDIAN], [/* Define to 1 if your processor stores words with the most significant byte m4trace:configure.in:70: -1- AH_OUTPUT([WORDS_BIGENDIAN], [/* Define to 1 if your processor stores words with the most significant byte
first (like Motorola and SPARC, unlike Intel and VAX). */ first (like Motorola and SPARC, unlike Intel and VAX). */

54
autom4te.cache/traces.1
Unescape View File

@ -3109,39 +3109,39 @@ m4trace:configure.in:61: -1- AC_SUBST([kde_templatesdir])
m4trace:configure.in:61: -1- AC_SUBST([kde_servicesdir]) m4trace:configure.in:61: -1- AC_SUBST([kde_servicesdir])
m4trace:configure.in:61: -1- AC_SUBST([kde_servicetypesdir]) m4trace:configure.in:61: -1- AC_SUBST([kde_servicetypesdir])
m4trace:configure.in:61: -1- AC_SUBST([kde_moduledir]) m4trace:configure.in:61: -1- AC_SUBST([kde_moduledir])
m4trace:configure.in:61: -1- AC_SUBST([kdeinitdir], ['$(kde_moduledir)']) m4trace:configure.in:61: -1- AC_SUBST([tdeinitdir], ['$(kde_moduledir)'])
m4trace:configure.in:61: -1- AC_SUBST([kde_styledir]) m4trace:configure.in:61: -1- AC_SUBST([kde_styledir])
m4trace:configure.in:61: -1- AC_SUBST([kde_widgetdir]) m4trace:configure.in:61: -1- AC_SUBST([kde_widgetdir])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KDECORE], ["-lkdecore"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_TDECORE], ["-ltdecore"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KDEUI], ["-lkdeui"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEUI], ["-ltdeui"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KIO], ["-lkio"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEIO], ["-ltdeio"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_SMB], ["-lsmb"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_SMB], ["-lsmb"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KAB], ["-lkab"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_KAB], ["-lkab"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KABC], ["-lkabc"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_KABC], ["-ltdeabc"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KHTML], ["-lkhtml"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEHTML], ["-ltdehtml"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KSPELL], ["-lkspell"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_TDESPELL], ["-ltdespell"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KPARTS], ["-lkparts"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEPARTS], ["-ltdeparts"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KDEPRINT], ["-lkdeprint"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEPRINT], ["-ltdeprint"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KUTILS], ["-lkutils"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEUTILS], ["-ltdeutils"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KDEPIM], ["-lkdepim"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEPIM], ["-ltdepim"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KSYCOCA], ["-lkio"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_TDESYCOCA], ["-ltdeio"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KFILE], ["-lkio"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_KFILE], ["-ltdeio"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KDECORE], ["-lkdecore"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_TDECORE], ["-ltdecore"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KDEUI], ["-lkdeui"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEUI], ["-ltdeui"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KIO], ["-lkio"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEIO], ["-ltdeio"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KSYCOCA], ["-lksycoca"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_TDESYCOCA], ["-ltdesycoca"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_SMB], ["-lsmb"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_SMB], ["-lsmb"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KFILE], ["-lkfile"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_KFILE], ["-ltdefile"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KAB], ["-lkab"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_KAB], ["-lkab"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KHTML], ["-lkhtml"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEHTML], ["-ltdehtml"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KSPELL], ["-lkspell"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_TDESPELL], ["-ltdespell"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KPARTS], ["-lkparts"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEPARTS], ["-ltdeparts"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KDEPRINT], ["-lkdeprint"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEPRINT], ["-ltdeprint"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KDECORE], ["-lkdecore -lXext $(LIB_QT)"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_TDECORE], ["-ltdecore -lXext $(LIB_QT)"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KDEUI], ["-lkdeui $(LIB_KDECORE)"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEUI], ["-ltdeui $(LIB_TDECORE)"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KFM], ["-lkfm $(LIB_KDECORE)"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_KFM], ["-lkfm $(LIB_TDECORE)"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KFILE], ["-lkfile $(LIB_KFM) $(LIB_KDEUI)"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_KFILE], ["-ltdefile $(LIB_KFM) $(LIB_TDEUI)"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KAB], ["-lkab $(LIB_KIMGIO) $(LIB_KDECORE)"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_KAB], ["-lkab $(LIB_KIMGIO) $(LIB_TDECORE)"])
m4trace:configure.in:70: -1- AC_DEFINE_TRACE_LITERAL([WORDS_BIGENDIAN]) m4trace:configure.in:70: -1- AC_DEFINE_TRACE_LITERAL([WORDS_BIGENDIAN])
m4trace:configure.in:70: -1- AH_OUTPUT([WORDS_BIGENDIAN], [/* Define to 1 if your processor stores words with the most significant byte m4trace:configure.in:70: -1- AH_OUTPUT([WORDS_BIGENDIAN], [/* Define to 1 if your processor stores words with the most significant byte
first (like Motorola and SPARC, unlike Intel and VAX). */ first (like Motorola and SPARC, unlike Intel and VAX). */

314
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:-/usr/local/kde} ac_default_prefix=${TDEDIR:-/usr/local/kde}
# 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 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 USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS 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 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 KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG KDECONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_libs_prefix kde_libs_htmldir 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_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KSYCOCA LIB_KFILE LIB_KFM LIB_XDAMAGE LIB_XCOMPOSITE LIB_IMLIB2 IMLIB2_CFLAGS 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 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 USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS 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 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 KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG KDECONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_libs_prefix kde_libs_htmldir 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_SMB LIB_KAB LIB_KABC LIB_TDEHTML LIB_TDESPELL LIB_TDEPARTS LIB_TDEPRINT LIB_TDEUTILS LIB_TDEPIM LIB_TDESYCOCA LIB_KFILE LIB_KFM LIB_XDAMAGE LIB_XCOMPOSITE LIB_IMLIB2 IMLIB2_CFLAGS TOPSUBDIRS LIBOBJS LTLIBOBJS'
ac_subst_files='' ac_subst_files=''
# Initialize some variables set by options. # Initialize some variables set by options.
@ -6312,18 +6312,18 @@ fi;
kdelibsuff=no tdelibsuff=no
# 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
@ -6333,16 +6333,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.
@ -21517,7 +21517,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
@ -21737,7 +21737,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
@ -26989,41 +26989,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
@ -27082,7 +27082,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
@ -28416,7 +28416,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;
@ -28480,7 +28480,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
@ -29277,16 +29277,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="/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="/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
@ -29315,8 +29315,8 @@ So, check this please and use another prefix!" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
kde_libdirs="/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="/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
@ -29340,7 +29340,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: 29345: $i/$j" >&5 echo "configure: 29345: $i/$j" >&5
if test -r "$i/$j"; then if test -r "$i/$j"; then
@ -29362,13 +29362,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
@ -29501,8 +29501,8 @@ fi
echo "$as_me:$LINENO: result: $kde_cv_uic_plugins" >&5 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: you need to install kdelibs first." >&5 { { echo "$as_me:$LINENO: error: you need to install tdelibs first." >&5
echo "$as_me: error: you need to install kdelibs first." >&2;} echo "$as_me: error: you need to install tdelibs first." >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
fi fi
@ -29675,20 +29675,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");
@ -29751,7 +29751,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
@ -29763,22 +29763,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
@ -29978,20 +29978,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");
@ -30054,7 +30054,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
@ -30066,22 +30066,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
@ -30182,11 +30182,11 @@ fi
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
@ -30463,12 +30463,12 @@ echo "${ECHO_T}$kde_cv_path" >&6
fi fi
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
@ -30484,16 +30484,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
@ -30590,12 +30590,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
@ -30611,16 +30611,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
@ -30640,10 +30640,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; }; }
@ -30783,7 +30783,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;
@ -30827,13 +30827,13 @@ done
if test -x "$KDECONFIG"; then # it can be "compiled" if test -x "$KDECONFIG"; then # it can be "compiled"
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
@ -30867,7 +30867,7 @@ echo "$as_me: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_
kdeinitdir='$(kde_moduledir)' tdeinitdir='$(kde_moduledir)'
@ -30885,68 +30885,68 @@ 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_SMB="-lsmb" LIB_SMB="-lsmb"
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"
# 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
@ -32445,22 +32445,22 @@ 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_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_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,@LIB_XDAMAGE@,$LIB_XDAMAGE,;t t s,@LIB_XDAMAGE@,$LIB_XDAMAGE,;t t
@ -33190,13 +33190,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

@ -166,13 +166,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

22
doc/Makefile.in
Unescape View File

@ -141,18 +141,18 @@ LIBZ = @LIBZ@
LIB_IMLIB2 = @LIB_IMLIB2@ LIB_IMLIB2 = @LIB_IMLIB2@
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_KFILE = @LIB_KFILE@ LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@ LIB_KFM = @LIB_KFM@
LIB_KHTML = @LIB_KHTML@ LIB_TDEHTML = @LIB_TDEHTML@
LIB_KIO = @LIB_KIO@ LIB_TDEIO = @LIB_TDEIO@
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@
@ -261,7 +261,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@

22
doc/en/Makefile.in
Unescape View File

@ -129,18 +129,18 @@ LIBZ = @LIBZ@
LIB_IMLIB2 = @LIB_IMLIB2@ LIB_IMLIB2 = @LIB_IMLIB2@
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_KFILE = @LIB_KFILE@ LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@ LIB_KFM = @LIB_KFM@
LIB_KHTML = @LIB_KHTML@ LIB_TDEHTML = @LIB_TDEHTML@
LIB_KIO = @LIB_KIO@ LIB_TDEIO = @LIB_TDEIO@
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@
@ -249,7 +249,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 kompose "<application>kompose 0&#46;1</application>"> <!ENTITY kompose "<application>kompose 0&#46;1</application>">
<!ENTITY kappname "&kompose;"><!-- Do *not* replace kappname--> <!ENTITY kappname "&kompose;"><!-- 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

22
po/Makefile.in
Unescape View File

@ -129,18 +129,18 @@ LIBZ = @LIBZ@
LIB_IMLIB2 = @LIB_IMLIB2@ LIB_IMLIB2 = @LIB_IMLIB2@
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_KFILE = @LIB_KFILE@ LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@ LIB_KFM = @LIB_KFM@
LIB_KHTML = @LIB_KHTML@ LIB_TDEHTML = @LIB_TDEHTML@
LIB_KIO = @LIB_KIO@ LIB_TDEIO = @LIB_TDEIO@
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@
@ -249,7 +249,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@

2
po/it.po
Unescape View File

@ -10,7 +10,7 @@ msgstr ""
"POT-Creation-Date: 2005-06-09 15:37+0200\n" "POT-Creation-Date: 2005-06-09 15:37+0200\n"
"PO-Revision-Date: 2004-10-12 16:51+0200\n" "PO-Revision-Date: 2004-10-12 16:51+0200\n"
"Last-Translator: Giorgio Moscardi <enjoy.the.silence@iol.it>\n" "Last-Translator: Giorgio Moscardi <enjoy.the.silence@iol.it>\n"
"Language-Team: Italiano <kde-i18n-it@kde.org>\n" "Language-Team: Italiano <tde-i18n-it@kde.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"

2
src/Makefile.am
Unescape View File

@ -32,7 +32,7 @@ kompose_SOURCES = main.cpp kompose.cpp komposetaskmanager.cpp komposetask.cpp \
komposetaskvisualizer.cpp komposeviewmanager.cpp komposedcopiface.skel komposetaskvisualizer.cpp komposeviewmanager.cpp komposedcopiface.skel
#kompose_LDFLAGS = $(KDE_RPATH) $(all_libraries) -lX11 -lXext -lm `pkg-config xft xrender xcomposite xdamage xfixes --libs` `imlib2-config --libs` #kompose_LDFLAGS = $(KDE_RPATH) $(all_libraries) -lX11 -lXext -lm `pkg-config xft xrender xcomposite xdamage xfixes --libs` `imlib2-config --libs`
kompose_LDFLAGS = $(KDE_RPATH) $(all_libraries) -lX11 -lXext -lm `imlib2-config --libs` kompose_LDFLAGS = $(KDE_RPATH) $(all_libraries) -lX11 -lXext -lm `imlib2-config --libs`
kompose_LDADD = $(LIB_KDEUI) $(LIB_XCOMPOSITE) $(LIB_XDAMAGE) kompose_LDADD = $(LIB_TDEUI) $(LIB_XCOMPOSITE) $(LIB_XDAMAGE)
# this is where the desktop file will go # this is where the desktop file will go
shelldesktopdir = $(kde_appsdir)/Utilities shelldesktopdir = $(kde_appsdir)/Utilities

24
src/Makefile.in
Unescape View File

@ -174,18 +174,18 @@ LIBZ = @LIBZ@
LIB_IMLIB2 = @LIB_IMLIB2@ LIB_IMLIB2 = @LIB_IMLIB2@
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_KFILE = @LIB_KFILE@ LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@ LIB_KFM = @LIB_KFM@
LIB_KHTML = @LIB_KHTML@ LIB_TDEHTML = @LIB_TDEHTML@
LIB_KIO = @LIB_KIO@ LIB_TDEIO = @LIB_TDEIO@
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@
@ -294,7 +294,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@
@ -344,7 +344,7 @@ kompose_SOURCES = main.cpp kompose.cpp komposetaskmanager.cpp komposetask.cpp \
#kompose_LDFLAGS = $(KDE_RPATH) $(all_libraries) -lX11 -lXext -lm `pkg-config xft xrender xcomposite xdamage xfixes --libs` `imlib2-config --libs` #kompose_LDFLAGS = $(KDE_RPATH) $(all_libraries) -lX11 -lXext -lm `pkg-config xft xrender xcomposite xdamage xfixes --libs` `imlib2-config --libs`
kompose_LDFLAGS = $(KDE_RPATH) $(all_libraries) -lX11 -lXext -lm `imlib2-config --libs` kompose_LDFLAGS = $(KDE_RPATH) $(all_libraries) -lX11 -lXext -lm `imlib2-config --libs`
kompose_LDADD = $(LIB_KDEUI) $(LIB_XCOMPOSITE) $(LIB_XDAMAGE) kompose_LDADD = $(LIB_TDEUI) $(LIB_XCOMPOSITE) $(LIB_XDAMAGE)
# this is where the desktop file will go # this is where the desktop file will go
shelldesktopdir = $(kde_appsdir)/Utilities shelldesktopdir = $(kde_appsdir)/Utilities

6
src/kompose.cpp
Unescape View File

@ -24,7 +24,7 @@
#include "komposesettings.h" #include "komposesettings.h"
#include "komposetaskmanager.h" #include "komposetaskmanager.h"
#include <klocale.h> #include <tdelocale.h>
#include <kuniqueapplication.h> #include <kuniqueapplication.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
@ -80,8 +80,8 @@ bool Kompose::x11EventFilter (XEvent *event)
#endif #endif
// This costed me nerves: // This costed me nerves:
// Call this or kwinmodule won't work // Call this or twinmodule won't work
return KApplication::x11EventFilter(event); return TDEApplication::x11EventFilter(event);
} }

4
src/kompose.desktop
Unescape View File

@ -15,5 +15,5 @@ Terminal=false
TerminalOptions= TerminalOptions=
Type=Application Type=Application
X-DCOP-ServiceType= X-DCOP-ServiceType=
X-KDE-SubstituteUID=false X-TDE-SubstituteUID=false
X-KDE-Username= X-TDE-Username=

10
src/komposedesktopwidget.cpp
Unescape View File

@ -33,11 +33,11 @@
#include <tqdragobject.h> #include <tqdragobject.h>
#include <tqtooltip.h> #include <tqtooltip.h>
#include <klocale.h> #include <tdelocale.h>
#include <kwin.h> #include <twin.h>
#include <ksharedpixmap.h> #include <ksharedpixmap.h>
#include <krootpixmap.h> #include <krootpixmap.h>
#include <kwinmodule.h> #include <twinmodule.h>
#include <kcursor.h> #include <kcursor.h>
#include <kdebug.h> #include <kdebug.h>
@ -55,8 +55,8 @@ KomposeDesktopWidget::KomposeDesktopWidget(int desktop, TQWidget *parent, Kompos
// Set Desktop background as our background // Set Desktop background as our background
setBackgroundMode( TQt::NoBackground ); setBackgroundMode( TQt::NoBackground );
KWinModule kwinmodule( this, 1 ); KWinModule twinmodule( this, 1 );
deskName = kwinmodule.desktopName(desktop+1); deskName = twinmodule.desktopName(desktop+1);
TQToolTip::add( this, i18n("Desktop %1 - %2").arg(desktop).arg(deskName) ); TQToolTip::add( this, i18n("Desktop %1 - %2").arg(desktop).arg(deskName) );

14
src/komposefullscreenwidget.cpp
Unescape View File

@ -23,13 +23,13 @@
#include <tqpainter.h> #include <tqpainter.h>
#include <tqdesktopwidget.h> #include <tqdesktopwidget.h>
#include <kwin.h> #include <twin.h>
#include <kapplication.h> #include <tdeapplication.h>
#include <kpopupmenu.h> #include <tdepopupmenu.h>
#include <kaction.h> #include <tdeaction.h>
#include <ksharedpixmap.h> #include <ksharedpixmap.h>
#include <kcursor.h> #include <kcursor.h>
#include <kglobalsettings.h> #include <tdeglobalsettings.h>
#include <kdebug.h> #include <kdebug.h>
#include <krootpixmap.h> #include <krootpixmap.h>
@ -59,7 +59,7 @@ KomposeFullscreenWidget::KomposeFullscreenWidget( int displayType, KomposeLayout
kdDebug() << KomposeSettings::instance()->getViewScreen() << endl; kdDebug() << KomposeSettings::instance()->getViewScreen() << endl;
if (KomposeSettings::instance()->getViewScreen() == -1) if (KomposeSettings::instance()->getViewScreen() == -1)
setGeometry( KGlobalSettings::desktopGeometry( this ) ); setGeometry( TDEGlobalSettings::desktopGeometry( this ) );
else else
{ {
TQDesktopWidget deskwidget; TQDesktopWidget deskwidget;
@ -83,7 +83,7 @@ KomposeFullscreenWidget::~KomposeFullscreenWidget()
void KomposeFullscreenWidget::initMenu() void KomposeFullscreenWidget::initMenu()
{ {
menu = new KPopupMenu(); menu = new TDEPopupMenu();
KomposeGlobal::instance()->getActShowWorldView()->plug(menu); KomposeGlobal::instance()->getActShowWorldView()->plug(menu);
KomposeGlobal::instance()->getActShowVirtualDesktopView()->plug(menu); KomposeGlobal::instance()->getActShowVirtualDesktopView()->plug(menu);

4
src/komposefullscreenwidget.h
Unescape View File

@ -19,7 +19,7 @@
class KRootPixmap; class KRootPixmap;
class KomposeDesktopWidget; class KomposeDesktopWidget;
class KPopupMenu; class TDEPopupMenu;
/** /**
@author Hans Oischinger @author Hans Oischinger
@ -54,7 +54,7 @@ protected:
private: private:
int type; int type;
KPopupMenu *menu; TDEPopupMenu *menu;
KRootPixmap *rootpix; KRootPixmap *rootpix;
}; };

40
src/komposeglobal.cpp
Unescape View File

@ -19,17 +19,17 @@
#include <tqtimer.h> #include <tqtimer.h>
#include <kapplication.h> #include <tdeapplication.h>
#include <kpopupmenu.h> #include <tdepopupmenu.h>
#include <kaction.h> #include <tdeaction.h>
#include <kactioncollection.h> #include <tdeactioncollection.h>
#include <klocale.h> #include <tdelocale.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kaccel.h> #include <tdeaccel.h>
#include <kkeydialog.h> #include <kkeydialog.h>
#include <kaboutapplication.h> #include <tdeaboutapplication.h>
#include <ksharedpixmap.h> #include <ksharedpixmap.h>
#include <kwinmodule.h> #include <twinmodule.h>
#include <kdebug.h> #include <kdebug.h>
#include <dcopclient.h> #include <dcopclient.h>
#include <dcopref.h> #include <dcopref.h>
@ -78,10 +78,10 @@ KomposeGlobal::KomposeGlobal(TQObject *parent, const char *name)
damageEvent(0) damageEvent(0)
{ {
globalInstance = this; globalInstance = this;
kwin_module = new KWinModule(); //FIXME: only needed for sharedpixmap :( twin_module = new KWinModule(); //FIXME: only needed for sharedpixmap :(
currentDesktop = kwin_module->currentDesktop(); currentDesktop = twin_module->currentDesktop();
desktopBgPixmap = new KSharedPixmap; desktopBgPixmap = new TDESharedPixmap;
connect(desktopBgPixmap, SIGNAL(done(bool)), SLOT(slotDone(bool))); connect(desktopBgPixmap, SIGNAL(done(bool)), SLOT(slotDone(bool)));
initSharedPixmaps(); initSharedPixmaps();
initCompositeExt(); initCompositeExt();
@ -151,19 +151,19 @@ void KomposeGlobal::initGui()
*/ */
void KomposeGlobal::initActions() void KomposeGlobal::initActions()
{ {
actionCollection = new KActionCollection( (TQWidget*)0 ); actionCollection = new TDEActionCollection( (TQWidget*)0 );
// Actions // Actions
actQuit = KStdAction::quit( kapp, SLOT(quit()), actionCollection ); actQuit = KStdAction::quit( kapp, SLOT(quit()), actionCollection );
actShowWorldView = new KAction(i18n("Komposé (ungrouped)"), "kompose_ungrouped", actShowWorldView = new TDEAction(i18n("Komposé (ungrouped)"), "kompose_ungrouped",
0, 0,
KomposeViewManager::instance(), SLOT(createWorldView()), KomposeViewManager::instance(), SLOT(createWorldView()),
actionCollection, "showWorldView"); actionCollection, "showWorldView");
actShowVirtualDesktopView = new KAction(i18n("Komposé (grouped by virtual desktops)"), "kompose_grouped_by_virtual_desktop", actShowVirtualDesktopView = new TDEAction(i18n("Komposé (grouped by virtual desktops)"), "kompose_grouped_by_virtual_desktop",
0, 0,
KomposeViewManager::instance(), SLOT(createVirtualDesktopView()), KomposeViewManager::instance(), SLOT(createVirtualDesktopView()),
actionCollection, "showVirtualDesktopView"); actionCollection, "showVirtualDesktopView");
actShowCurrentDesktopView = new KAction(i18n("Komposé (current virtual desktop)"), "kompose_current_virtual_desktop", actShowCurrentDesktopView = new TDEAction(i18n("Komposé (current virtual desktop)"), "kompose_current_virtual_desktop",
0, 0,
KomposeViewManager::instance(), SLOT(createCurrentDesktopView()), KomposeViewManager::instance(), SLOT(createCurrentDesktopView()),
actionCollection, "showCurrentDesktopView"); actionCollection, "showCurrentDesktopView");
@ -173,7 +173,7 @@ void KomposeGlobal::initActions()
actConfigGlobalShortcuts = KStdAction::keyBindings(this, SLOT(showGlobalShortcutsSettingsDialog()), actConfigGlobalShortcuts = KStdAction::keyBindings(this, SLOT(showGlobalShortcutsSettingsDialog()),
actionCollection, "options_configure_global_keybinding"); actionCollection, "options_configure_global_keybinding");
actConfigGlobalShortcuts->setText(i18n("Configure &Global Shortcuts...")); actConfigGlobalShortcuts->setText(i18n("Configure &Global Shortcuts..."));
actAboutDlg = new KAction(i18n("About Komposé"), "kompose", actAboutDlg = new TDEAction(i18n("About Komposé"), "kompose",
0, 0,
this, SLOT(showAboutDlg()), this, SLOT(showAboutDlg()),
actionCollection, "showAboutDlg"); actionCollection, "showAboutDlg");
@ -182,8 +182,8 @@ void KomposeGlobal::initActions()
void KomposeGlobal::initSharedPixmaps() void KomposeGlobal::initSharedPixmaps()
{ {
// Whenever the background pixmap changes we'll have to reload it: // Whenever the background pixmap changes we'll have to reload it:
//connect(kwin_module, SIGNAL(windowChanged(WId, unsigned int)), SLOT(desktopChanged(WId, unsigned int))); //connect(twin_module, SIGNAL(windowChanged(WId, unsigned int)), SLOT(desktopChanged(WId, unsigned int)));
connect(kwin_module, SIGNAL(currentDesktopChanged(int)), SLOT(slotDesktopChanged(int))); connect(twin_module, SIGNAL(currentDesktopChanged(int)), SLOT(slotDesktopChanged(int)));
connect(kapp, SIGNAL(backgroundChanged(int)), SLOT(slotBackgroundChanged(int))); connect(kapp, SIGNAL(backgroundChanged(int)), SLOT(slotBackgroundChanged(int)));
enablePixmapExports(); enablePixmapExports();
@ -215,7 +215,7 @@ void KomposeGlobal::slotDesktopChanged(int desktop)
return; return;
} }
currentDesktop = kwin_module->currentDesktop(); currentDesktop = twin_module->currentDesktop();
refreshSharedPixmaps(); refreshSharedPixmaps();
} }
@ -285,7 +285,7 @@ void KomposeGlobal::showGlobalShortcutsSettingsDialog()
void KomposeGlobal::showAboutDlg() void KomposeGlobal::showAboutDlg()
{ {
aboutDialogOpen = true; aboutDialogOpen = true;
KAboutApplication* kabout = new KAboutApplication(); TDEAboutApplication* kabout = new TDEAboutApplication();
kabout->exec(); kabout->exec();
delete kabout; delete kabout;
aboutDialogOpen = false; aboutDialogOpen = false;

44
src/komposeglobal.h
Unescape View File

@ -17,10 +17,10 @@ class KomposeSysTray;
#include <tqobject.h> #include <tqobject.h>
#include <tqstring.h> #include <tqstring.h>
class KPopupMenu; class TDEPopupMenu;
class KActionCollection; class TDEActionCollection;
class KAction; class TDEAction;
class KSharedPixmap; class TDESharedPixmap;
class KWinModule; class KWinModule;
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
@ -55,15 +55,15 @@ public:
int getDamageEvent() { return damageEvent; } int getDamageEvent() { return damageEvent; }
// Action getters // Action getters
KAction *getActConfigGlobalShortcuts() { return actConfigGlobalShortcuts; } TDEAction *getActConfigGlobalShortcuts() { return actConfigGlobalShortcuts; }
KAction *getActPreferencesDialog() { return actPreferencesDialog; } TDEAction *getActPreferencesDialog() { return actPreferencesDialog; }
KAction *getActShowVirtualDesktopView() { return actShowVirtualDesktopView; } TDEAction *getActShowVirtualDesktopView() { return actShowVirtualDesktopView; }
KAction *getActShowCurrentDesktopView() { return actShowCurrentDesktopView; } TDEAction *getActShowCurrentDesktopView() { return actShowCurrentDesktopView; }
KAction *getActShowWorldView() { return actShowWorldView; } TDEAction *getActShowWorldView() { return actShowWorldView; }
KAction *getActAboutDlg() { return actAboutDlg; } TDEAction *getActAboutDlg() { return actAboutDlg; }
KAction *getActQuit() { return actQuit; } TDEAction *getActQuit() { return actQuit; }
const KSharedPixmap *getDesktopBgPixmap() const { return desktopBgPixmap; } const TDESharedPixmap *getDesktopBgPixmap() const { return desktopBgPixmap; }
protected: protected:
void initActions(); void initActions();
@ -90,20 +90,20 @@ private:
bool xcomposite; bool xcomposite;
int damageEvent, damageError; int damageEvent, damageError;
KSharedPixmap *desktopBgPixmap; TDESharedPixmap *desktopBgPixmap;
int currentDesktop; int currentDesktop;
KomposeSysTray* systray; KomposeSysTray* systray;
KActionCollection* actionCollection; TDEActionCollection* actionCollection;
KAction *actConfigGlobalShortcuts; TDEAction *actConfigGlobalShortcuts;
KAction *actPreferencesDialog; TDEAction *actPreferencesDialog;
KAction *actShowVirtualDesktopView; TDEAction *actShowVirtualDesktopView;
KAction *actShowCurrentDesktopView; TDEAction *actShowCurrentDesktopView;
KAction *actShowWorldView; TDEAction *actShowWorldView;
KAction *actAboutDlg; TDEAction *actAboutDlg;
KAction *actQuit; TDEAction *actQuit;
KWinModule* kwin_module; KWinModule* twin_module;
}; };
#endif #endif

2
src/komposelayout.cpp
Unescape View File

@ -26,7 +26,7 @@
#include <math.h> #include <math.h>
#include <kwin.h> #include <twin.h>
#include <kdebug.h> #include <kdebug.h>

16
src/komposepreferences.cpp
Unescape View File

@ -17,7 +17,7 @@
#include <tqlayout.h> #include <tqlayout.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <kapplication.h> #include <tdeapplication.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
#include <tqtooltip.h> #include <tqtooltip.h>
#include <tqspinbox.h> #include <tqspinbox.h>
@ -32,7 +32,7 @@
#include <kiconloader.h> #include <kiconloader.h>
#include <kcolorbutton.h> #include <kcolorbutton.h>
#include <kfontdialog.h> #include <tdefontdialog.h>
KomposePreferences::KomposePreferences() KomposePreferences::KomposePreferences()
: KDialogBase(IconList, i18n("Komposé Preferences"), Ok|Apply|Cancel, Ok) : KDialogBase(IconList, i18n("Komposé Preferences"), Ok|Apply|Cancel, Ok)
@ -41,9 +41,9 @@ KomposePreferences::KomposePreferences()
// How about TQt Designer?! // How about TQt Designer?!
m_hasXinerama = TQDesktopWidget().numScreens() > 1; m_hasXinerama = TQDesktopWidget().numScreens() > 1;
TQFrame *page1 = addPage( i18n("Behavior"), TQString::null, DesktopIcon("winprops", KIcon::SizeMedium) ); TQFrame *page1 = addPage( i18n("Behavior"), TQString::null, DesktopIcon("winprops", TDEIcon::SizeMedium) );
TQFrame *page2 = addPage( i18n("Appearance"), TQString::null, DesktopIcon("appearance", KIcon::SizeMedium) ); TQFrame *page2 = addPage( i18n("Appearance"), TQString::null, DesktopIcon("appearance", TDEIcon::SizeMedium) );
TQFrame *page3 = addPage( i18n("Layouts"), TQString::null, DesktopIcon("window_list", KIcon::SizeMedium) ); TQFrame *page3 = addPage( i18n("Layouts"), TQString::null, DesktopIcon("window_list", TDEIcon::SizeMedium) );
TQVBoxLayout *page1Layout = new TQVBoxLayout( page1, 0, KDialog::spacingHint() ); TQVBoxLayout *page1Layout = new TQVBoxLayout( page1, 0, KDialog::spacingHint() );
@ -266,13 +266,13 @@ void KomposePreferences::updateIconSliderDesc( int val )
void KomposePreferences::showWindowTitleFontDialog() void KomposePreferences::showWindowTitleFontDialog()
{ {
KFontDialog::getFont( *windowTitleFont ); TDEFontDialog::getFont( *windowTitleFont );
// if ( result == KFontDialog::Accepted ) // if ( result == TDEFontDialog::Accepted )
} }
void KomposePreferences::showDesktopTitleFontDialog() void KomposePreferences::showDesktopTitleFontDialog()
{ {
KFontDialog::getFont( *desktopTitleFont ); TDEFontDialog::getFont( *desktopTitleFont );
} }
void KomposePreferences::fillPages() void KomposePreferences::fillPages()

16
src/komposepreferences.cpp.orig
Unescape View File

@ -16,7 +16,7 @@
#include <tqlayout.h> #include <tqlayout.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <kapplication.h> #include <tdeapplication.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
#include <tqtooltip.h> #include <tqtooltip.h>
#include <tqspinbox.h> #include <tqspinbox.h>
@ -31,14 +31,14 @@
#include <kiconloader.h> #include <kiconloader.h>
#include <kcolorbutton.h> #include <kcolorbutton.h>
#include <kfontdialog.h> #include <tdefontdialog.h>
KomposePreferences::KomposePreferences() KomposePreferences::KomposePreferences()
: KDialogBase(IconList, i18n(TQString::fromUtf8("Komposé Preferences").utf8()), Ok|Apply|Cancel, Ok) : KDialogBase(IconList, i18n(TQString::fromUtf8("Komposé Preferences").utf8()), Ok|Apply|Cancel, Ok)
{ {
TQFrame *page1 = addPage( i18n("Behavior"), TQString::null, DesktopIcon("winprops", KIcon::SizeMedium) ); TQFrame *page1 = addPage( i18n("Behavior"), TQString::null, DesktopIcon("winprops", TDEIcon::SizeMedium) );
TQFrame *page2 = addPage( i18n("Appearance"), TQString::null, DesktopIcon("appearance", KIcon::SizeMedium) ); TQFrame *page2 = addPage( i18n("Appearance"), TQString::null, DesktopIcon("appearance", TDEIcon::SizeMedium) );
TQFrame *page3 = addPage( i18n("Layouts"), TQString::null, DesktopIcon("window_list", KIcon::SizeMedium) ); TQFrame *page3 = addPage( i18n("Layouts"), TQString::null, DesktopIcon("window_list", TDEIcon::SizeMedium) );
TQVBoxLayout *page1Layout = new TQVBoxLayout( page1, 0, KDialog::spacingHint() ); TQVBoxLayout *page1Layout = new TQVBoxLayout( page1, 0, KDialog::spacingHint() );
@ -195,13 +195,13 @@ void KomposePreferences::updateIconSliderDesc( int val )
void KomposePreferences::showWindowTitleFontDialog() void KomposePreferences::showWindowTitleFontDialog()
{ {
KFontDialog::getFont( *windowTitleFont ); TDEFontDialog::getFont( *windowTitleFont );
// if ( result == KFontDialog::Accepted ) // if ( result == TDEFontDialog::Accepted )
} }
void KomposePreferences::showDesktopTitleFontDialog() void KomposePreferences::showDesktopTitleFontDialog()
{ {
KFontDialog::getFont( *desktopTitleFont ); TDEFontDialog::getFont( *desktopTitleFont );
} }
void KomposePreferences::fillPages() void KomposePreferences::fillPages()

2
src/komposepreferences.h
Unescape View File

@ -14,7 +14,7 @@
#include <kdialogbase.h> #include <kdialogbase.h>
#include <klocale.h> #include <tdelocale.h>
class TQCheckBox; class TQCheckBox;
class TQFrame; class TQFrame;

8
src/komposesettings.cpp
Unescape View File

@ -18,9 +18,9 @@
#include <tqcolor.h> #include <tqcolor.h>
#include <kglobalaccel.h> #include <kglobalaccel.h>
#include <kapplication.h> #include <tdeapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kglobal.h> #include <tdeglobal.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kdebug.h> #include <kdebug.h>
@ -48,7 +48,7 @@ KomposeSettings::KomposeSettings(TQObject *parent, const char *name)
{ {
// Init global shortcut object // Init global shortcut object
globalAccel = new KGlobalAccel( this ); globalAccel = new TDEGlobalAccel( this );
globalAccel->insert( "showDefaultView", i18n("Show Komposé (default view)"), globalAccel->insert( "showDefaultView", i18n("Show Komposé (default view)"),
i18n("Displays the view you have configured as default"), i18n("Displays the view you have configured as default"),
KKey::TQtWIN+Key_Tab, KKey::TQtWIN+CTRL+SHIFT+Key_Tab, KKey::TQtWIN+Key_Tab, KKey::TQtWIN+CTRL+SHIFT+Key_Tab,

6
src/komposesettings.h
Unescape View File

@ -20,7 +20,7 @@
enum KomposeDisplay { KOMPOSEDISPLAY_WORLD, KOMPOSEDISPLAY_VIRTUALDESKS, KOMPOSEDISPLAY_CURRENTDESK }; enum KomposeDisplay { KOMPOSEDISPLAY_WORLD, KOMPOSEDISPLAY_VIRTUALDESKS, KOMPOSEDISPLAY_CURRENTDESK };
class KGlobalAccel; class TDEGlobalAccel;
class TQFontMetrics; class TQFontMetrics;
@ -41,7 +41,7 @@ public:
void writeConfig(); void writeConfig();
bool hasDialogOpen() { return dialogOpen; } bool hasDialogOpen() { return dialogOpen; }
KGlobalAccel *getGlobalAccel() const { return globalAccel; } TDEGlobalAccel *getGlobalAccel() const { return globalAccel; }
bool getUseComposite() const { return useComposite; } bool getUseComposite() const { return useComposite; }
void setUseComposite( bool b ) { useComposite = b; } void setUseComposite( bool b ) { useComposite = b; }
@ -125,7 +125,7 @@ signals:
void settingsChanged(); void settingsChanged();
private: private:
KGlobalAccel *globalAccel; TDEGlobalAccel *globalAccel;
bool dialogOpen; bool dialogOpen;
bool useComposite; bool useComposite;

12
src/komposesystray.cpp
Unescape View File

@ -21,11 +21,11 @@
#include <tqbitmap.h> #include <tqbitmap.h>
#include <tqpainter.h> #include <tqpainter.h>
#include <kapplication.h> #include <tdeapplication.h>
#include <kaction.h> #include <tdeaction.h>
#include <kpopupmenu.h> #include <tdepopupmenu.h>
#include <kiconeffect.h> #include <kiconeffect.h>
#include <kglobalsettings.h> #include <tdeglobalsettings.h>
KomposeSysTray::KomposeSysTray(TQWidget *parent, const char *name) KomposeSysTray::KomposeSysTray(TQWidget *parent, const char *name)
: KSystemTray(parent, name) : KSystemTray(parent, name)
@ -97,7 +97,7 @@ void KomposeSysTray::currentDesktopChanged(int desktop)
int oldH = pixmap()->size().height(); int oldH = pixmap()->size().height();
TQString uStr=TQString::number( desktop ); TQString uStr=TQString::number( desktop );
TQFont f=KGlobalSettings::generalFont(); TQFont f=TDEGlobalSettings::generalFont();
f.setBold(true); f.setBold(true);
f.setItalic(true); f.setItalic(true);
float pointSize=f.pointSizeFloat(); float pointSize=f.pointSizeFloat();
@ -118,7 +118,7 @@ void KomposeSysTray::currentDesktopChanged(int desktop)
TQImage img=pix.convertToImage(); TQImage img=pix.convertToImage();
// overlay // overlay
TQImage overlayImg=icon.copy(); TQImage overlayImg=icon.copy();
KIconEffect::overlay(overlayImg, img); TDEIconEffect::overlay(overlayImg, img);
TQPixmap newIcon; TQPixmap newIcon;
newIcon.convertFromImage(overlayImg); newIcon.convertFromImage(overlayImg);
setPixmap(newIcon); setPixmap(newIcon);

8
src/komposesystray.h
Unescape View File

@ -16,9 +16,9 @@
#include <tqimage.h> #include <tqimage.h>
class KAction; class TDEAction;
class KGlobalAccel; class TDEGlobalAccel;
class KPopupMenu; class TDEPopupMenu;
/** /**
@author Hans Oischinger @author Hans Oischinger
@ -40,7 +40,7 @@ protected slots:
void slotConfigChanged(); void slotConfigChanged();
private: private:
KPopupMenu *menu; TDEPopupMenu *menu;
TQImage icon; TQImage icon;
}; };

12
src/komposetask.cpp
Unescape View File

@ -30,8 +30,8 @@
#include <tqpixmap.h> #include <tqpixmap.h>
#include <kpixmapio.h> #include <kpixmapio.h>
#include <kwinmodule.h> #include <twinmodule.h>
#include <klocale.h> #include <tdelocale.h>
#include <kdebug.h> #include <kdebug.h>
#include <netwm.h> #include <netwm.h>
@ -41,9 +41,9 @@
#include "komposetaskvisualizer.h" #include "komposetaskvisualizer.h"
#include <X11/Xlib.h> #include <X11/Xlib.h>
KomposeTask::KomposeTask(WId win, KWinModule *kwinmod, TQObject *parent, const char *name) KomposeTask::KomposeTask(WId win, KWinModule *twinmod, TQObject *parent, const char *name)
: TQObject(parent, name), : TQObject(parent, name),
kwinmodule(kwinmod), twinmodule(twinmod),
windowID(win), windowID(win),
blockDamageEvents(false) blockDamageEvents(false)
{ {
@ -105,7 +105,7 @@ bool KomposeTask::isOnTop() const
bool KomposeTask::isActive() const bool KomposeTask::isActive() const
{ {
if ( kwinmodule->activeWindow() == windowID ) if ( twinmodule->activeWindow() == windowID )
return true; return true;
else else
return false; return false;
@ -244,7 +244,7 @@ void KomposeTask::toDesktop(int desk)
void KomposeTask::toCurrentDesktop() void KomposeTask::toCurrentDesktop()
{ {
toDesktop(kwinmodule->currentDesktop()); toDesktop(twinmodule->currentDesktop());
} }
void KomposeTask::setAlwaysOnTop(bool stay) void KomposeTask::setAlwaysOnTop(bool stay)

6
src/komposetask.h
Unescape View File

@ -22,7 +22,7 @@
#include <tqobject.h> #include <tqobject.h>
#include <tqrect.h> #include <tqrect.h>
#include <kwin.h> #include <twin.h>
class KWinModule; class KWinModule;
class KomposeTaskVisualizer; class KomposeTaskVisualizer;
@ -34,7 +34,7 @@ class KomposeTask : public TQObject
{ {
Q_OBJECT Q_OBJECT
public: public:
KomposeTask(WId win, KWinModule *kwinmod, TQObject *parent = 0, const char *name = 0); KomposeTask(WId win, KWinModule *twinmod, TQObject *parent = 0, const char *name = 0);
~KomposeTask(); ~KomposeTask();
@ -106,7 +106,7 @@ protected slots:
void unBlockDamageEvents() { blockDamageEvents = false; } void unBlockDamageEvents() { blockDamageEvents = false; }
private: private:
KWinModule* kwinmodule; KWinModule* twinmodule;
WId windowID; WId windowID;
WId wmframeID; WId wmframeID;
KWin::WindowInfo windowInfo; KWin::WindowInfo windowInfo;

40
src/komposetaskmanager.cpp
Unescape View File

@ -32,11 +32,11 @@
#include <tqpixmap.h> #include <tqpixmap.h>
#include <tqwidget.h> #include <tqwidget.h>
#include <kapplication.h> #include <tdeapplication.h>
#include <kwinmodule.h> #include <twinmodule.h>
#include <netwm.h> #include <netwm.h>
#include <kwin.h> #include <twin.h>
#include <kapplication.h> #include <tdeapplication.h>
#include <kdebug.h> #include <kdebug.h>
#ifdef COMPOSITE #ifdef COMPOSITE
@ -69,32 +69,32 @@ KomposeTaskManager::KomposeTaskManager()
: TQObject() : TQObject()
{ {
taskManagerInstance = this; taskManagerInstance = this;
kwin_module = new KWinModule(); twin_module = new KWinModule();
numDesks = KWin::numberOfDesktops(); numDesks = KWin::numberOfDesktops();
callCompositeRedirect(); callCompositeRedirect();
// Listeners for KWinmodule signals // Listeners for KWinmodule signals
connect( kwin_module, SIGNAL(windowAdded(WId)), this, SLOT(slotWindowAdded(WId)) ); connect( twin_module, SIGNAL(windowAdded(WId)), this, SLOT(slotWindowAdded(WId)) );
connect( kwin_module, SIGNAL(windowRemoved(WId)), this, SLOT(slotWindowRemoved(WId)) ); connect( twin_module, SIGNAL(windowRemoved(WId)), this, SLOT(slotWindowRemoved(WId)) );
connect( kwin_module, SIGNAL(numberOfDesktopsChanged(int)), this, SLOT(slotDesktopCountChanged(int)) ); connect( twin_module, SIGNAL(numberOfDesktopsChanged(int)), this, SLOT(slotDesktopCountChanged(int)) );
connect( kwin_module, SIGNAL(currentDesktopChanged(int)), this, SLOT(slotCurrentDesktopChanged(int)) ); connect( twin_module, SIGNAL(currentDesktopChanged(int)), this, SLOT(slotCurrentDesktopChanged(int)) );
connect( KomposeSettings::instance(), SIGNAL(settingsChanged()), this, SLOT(slotStartWindowListeners()) ); connect( KomposeSettings::instance(), SIGNAL(settingsChanged()), this, SLOT(slotStartWindowListeners()) );
connect( KomposeSettings::instance(), SIGNAL(settingsChanged()), this, SLOT(callCompositeRedirect()) ); connect( KomposeSettings::instance(), SIGNAL(settingsChanged()), this, SLOT(callCompositeRedirect()) );
// register existing windows // register existing windows
const TQValueList<WId> windows = kwin_module->windows(); const TQValueList<WId> windows = twin_module->windows();
for (TQValueList<WId>::ConstIterator it = windows.begin(); it != windows.end(); ++it ) for (TQValueList<WId>::ConstIterator it = windows.begin(); it != windows.end(); ++it )
slotWindowAdded(*it); slotWindowAdded(*it);
connect( kwin_module, SIGNAL(activeWindowChanged(WId)), this, SLOT(slotTaskActivated(WId)) ); connect( twin_module, SIGNAL(activeWindowChanged(WId)), this, SLOT(slotTaskActivated(WId)) );
slotStartWindowListeners(); slotStartWindowListeners();
} }
KomposeTaskManager::~KomposeTaskManager() KomposeTaskManager::~KomposeTaskManager()
{ {
delete kwin_module; delete twin_module;
} }
/** /**
@ -137,9 +137,9 @@ KomposeTask* KomposeTaskManager::findTask(WId w, bool wmFrameIds )
void KomposeTaskManager::slotStartWindowListeners() void KomposeTaskManager::slotStartWindowListeners()
{ {
disconnect( kwin_module, SIGNAL(windowChanged( WId, unsigned int )), this, disconnect( twin_module, SIGNAL(windowChanged( WId, unsigned int )), this,
SLOT(slotWindowChanged( WId, unsigned int )) ); SLOT(slotWindowChanged( WId, unsigned int )) );
connect( kwin_module, SIGNAL(windowChanged( WId, unsigned int )), this, connect( twin_module, SIGNAL(windowChanged( WId, unsigned int )), this,
SLOT(slotWindowChanged( WId, unsigned int )) ); SLOT(slotWindowChanged( WId, unsigned int )) );
} }
@ -220,7 +220,7 @@ void KomposeTaskManager::slotWindowAdded(WId w )
return; return;
kdDebug() << "KomposeTaskManager::slotWindowAdded(WId " << w <<" ) - Adding KomposeTask" << endl; kdDebug() << "KomposeTaskManager::slotWindowAdded(WId " << w <<" ) - Adding KomposeTask" << endl;
KomposeTask* t = new KomposeTask(w, kwin_module, this); KomposeTask* t = new KomposeTask(w, twin_module, this);
tasklist.append(t); tasklist.append(t);
emit newTask( t ); emit newTask( t );
@ -261,7 +261,7 @@ void KomposeTaskManager::slotUpdateScreenshots( bool switchDesktops )
void KomposeTaskManager::simulatePasvScreenshotEvent() void KomposeTaskManager::simulatePasvScreenshotEvent()
{ {
kdDebug() << "KomposeTaskManager::simulatePasvScreenshotEvent()" << endl; kdDebug() << "KomposeTaskManager::simulatePasvScreenshotEvent()" << endl;
slotTaskActivated( kwin_module->activeWindow() ); slotTaskActivated( twin_module->activeWindow() );
} }
/** /**
@ -293,8 +293,8 @@ bool KomposeTaskManager::isOnTop(const KomposeTask* task)
{ {
if(!task) return false; if(!task) return false;
for (TQValueList<WId>::ConstIterator it = kwin_module->stackingOrder().fromLast(); for (TQValueList<WId>::ConstIterator it = twin_module->stackingOrder().fromLast();
it != kwin_module->stackingOrder().end(); --it ) it != twin_module->stackingOrder().end(); --it )
{ {
for (KomposeTask* t = tasklist.first(); t != 0; t = tasklist.next() ) for (KomposeTask* t = tasklist.first(); t != 0; t = tasklist.next() )
{ {
@ -313,7 +313,7 @@ bool KomposeTaskManager::isOnTop(const KomposeTask* task)
TQString KomposeTaskManager::getDesktopName(int desk) const TQString KomposeTaskManager::getDesktopName(int desk) const
{ {
return kwin_module->desktopName(desk); return twin_module->desktopName(desk);
} }
@ -381,7 +381,7 @@ void KomposeTaskManager::slotCurrentDesktopChanged(int d)
int KomposeTaskManager::getCurrentDesktopNum() int KomposeTaskManager::getCurrentDesktopNum()
{ {
return kwin_module->currentDesktop(); return twin_module->currentDesktop();
} }
#include "komposetaskmanager.moc" #include "komposetaskmanager.moc"

2
src/komposetaskmanager.h
Unescape View File

@ -77,7 +77,7 @@ protected:
KomposeTask* findTask(WId w, bool wmFrameIds = false); KomposeTask* findTask(WId w, bool wmFrameIds = false);
private: private:
KWinModule* kwin_module; KWinModule* twin_module;
TaskList tasklist; // list of tasks handled by the WM TaskList tasklist; // list of tasks handled by the WM
int numDesks; // total num of desks int numDesks; // total num of desks

14
src/komposetaskprefswidget.cpp
Unescape View File

@ -16,19 +16,19 @@
#include "komposetaskprefswidget.h" #include "komposetaskprefswidget.h"
#include "komposesettings.h" #include "komposesettings.h"
#include <ktoolbar.h> #include <tdetoolbar.h>
#include <ktoolbarbutton.h> #include <tdetoolbarbutton.h>
#include <kactioncollection.h> #include <tdeactioncollection.h>
#include <kaction.h> #include <tdeaction.h>
#include <kshortcut.h> #include <tdeshortcut.h>
#include <klocale.h> #include <tdelocale.h>
#include <tqiconset.h> #include <tqiconset.h>
KomposeTaskPrefsWidget::KomposeTaskPrefsWidget(KomposeTaskWidget *parent, const char *name) KomposeTaskPrefsWidget::KomposeTaskPrefsWidget(KomposeTaskWidget *parent, const char *name)
: TQDockArea(TQt::Horizontal , TQDockArea::Normal, parent, name) : TQDockArea(TQt::Horizontal , TQDockArea::Normal, parent, name)
{ {
KToolBar* pToolBar = new KToolBar( this, i18n("Task Actions") ); TDEToolBar* pToolBar = new TDEToolBar( this, i18n("Task Actions") );
pToolBar->setLabel(i18n("Task")); pToolBar->setLabel(i18n("Task"));
pToolBar->setResizeEnabled ( false ); pToolBar->setResizeEnabled ( false );
pToolBar->setMovingEnabled ( false ); pToolBar->setMovingEnabled ( false );

2
src/komposetaskvisualizer.cpp
Unescape View File

@ -17,7 +17,7 @@
#include <tqpixmap.h> #include <tqpixmap.h>
#include <tqtimer.h> #include <tqtimer.h>
#include <kwin.h> #include <twin.h>
#include <netwm.h> #include <netwm.h>
#include <tqapplication.h> #include <tqapplication.h>
#include <kdebug.h> #include <kdebug.h>

22
src/komposetaskwidget.cpp
Unescape View File

@ -40,11 +40,11 @@
#include <tqfont.h> #include <tqfont.h>
#include <kcursor.h> #include <kcursor.h>
#include <klocale.h> #include <tdelocale.h>
#include <kpopupmenu.h> #include <tdepopupmenu.h>
#include <kactioncollection.h> #include <tdeactioncollection.h>
#include <kaction.h> #include <tdeaction.h>
#include <kapplication.h> #include <tdeapplication.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kdebug.h> #include <kdebug.h>
@ -345,18 +345,18 @@ void KomposeTaskWidget::setGeometry( const TQRect &rect )
void KomposeTaskWidget::initActions() void KomposeTaskWidget::initActions()
{ {
taskActionCollection = new KActionCollection( this ); taskActionCollection = new TDEActionCollection( this );
actCloseTask = new KAction( i18n("Close"), "fileclose", Key_Delete , task, actCloseTask = new TDEAction( i18n("Close"), "fileclose", Key_Delete , task,
SLOT( close() ), taskActionCollection, "closeTask" ); SLOT( close() ), taskActionCollection, "closeTask" );
actCloseTask->setToolTip(i18n("Close")); actCloseTask->setToolTip(i18n("Close"));
actMinimizeRestoreTask = new KAction( i18n("Minimize/Restore"), "", KShortcut() , this, actMinimizeRestoreTask = new TDEAction( i18n("Minimize/Restore"), "", TDEShortcut() , this,
SLOT( slotMinimizeRestoreToggled() ), taskActionCollection, "minimizeRestoreTask" ); SLOT( slotMinimizeRestoreToggled() ), taskActionCollection, "minimizeRestoreTask" );
} }
void KomposeTaskWidget::initMenu() void KomposeTaskWidget::initMenu()
{ {
menu = new KPopupMenu(); menu = new TDEPopupMenu();
actMinimizeRestoreTask->plug(menu); actMinimizeRestoreTask->plug(menu);
@ -393,9 +393,9 @@ void KomposeTaskWidget::initMenu()
void KomposeTaskWidget::setActionIcons( bool inverse ) void KomposeTaskWidget::setActionIcons( bool inverse )
{ {
if ( ( task->isIconified() && !inverse ) || ( !task->isIconified() && inverse ) ) if ( ( task->isIconified() && !inverse ) || ( !task->isIconified() && inverse ) )
actMinimizeRestoreTask->setIconSet( kapp->iconLoader()->loadIconSet ( "up", KIcon::NoGroup, 16 ) ); actMinimizeRestoreTask->setIconSet( kapp->iconLoader()->loadIconSet ( "up", TDEIcon::NoGroup, 16 ) );
else else
actMinimizeRestoreTask->setIconSet( kapp->iconLoader()->loadIconSet ( "bottom", KIcon::NoGroup, 16 ) ); actMinimizeRestoreTask->setIconSet( kapp->iconLoader()->loadIconSet ( "bottom", TDEIcon::NoGroup, 16 ) );
} }
void KomposeTaskWidget::slotMinimizeRestoreToggled() void KomposeTaskWidget::slotMinimizeRestoreToggled()

18
src/komposetaskwidget.h
Unescape View File

@ -29,9 +29,9 @@
class KomposeTask; class KomposeTask;
class KomposeLayout; class KomposeLayout;
class KPopupMenu; class TDEPopupMenu;
class KAction; class TDEAction;
class KActionCollection; class TDEActionCollection;
/** /**
@author Hans Oischinger @author Hans Oischinger
@ -49,8 +49,8 @@ public:
double getAspectRatio(); double getAspectRatio();
KomposeTask* getTask() const { return task; }; KomposeTask* getTask() const { return task; };
KAction* getActMinimizeRestoreTask() { return actMinimizeRestoreTask; } TDEAction* getActMinimizeRestoreTask() { return actMinimizeRestoreTask; }
KAction* getActCloseTask() { return actCloseTask; } TDEAction* getActCloseTask() { return actCloseTask; }
signals: signals:
void requestRemoval(KomposeWidget*); void requestRemoval(KomposeWidget*);
@ -90,11 +90,11 @@ private:
KomposeTask* task; KomposeTask* task;
KomposeTaskPrefsWidget *prefWidget; KomposeTaskPrefsWidget *prefWidget;
KPopupMenu *menu; TDEPopupMenu *menu;
KActionCollection *taskActionCollection; TDEActionCollection *taskActionCollection;
KAction *actMinimizeRestoreTask; TDEAction *actMinimizeRestoreTask;
KAction *actCloseTask; TDEAction *actCloseTask;
}; };
#endif #endif

4
src/komposeviewmanager.cpp
Unescape View File

@ -23,8 +23,8 @@
#include <tqwidgetlist.h> #include <tqwidgetlist.h>
#include <tqdesktopwidget.h> #include <tqdesktopwidget.h>
#include <kwin.h> #include <twin.h>
#include <kapplication.h> #include <tdeapplication.h>
#include <kdebug.h> #include <kdebug.h>

20
src/main.cpp
Unescape View File

@ -23,9 +23,9 @@
#include <stdlib.h> #include <stdlib.h>
#include <kaboutdata.h> #include <tdeaboutdata.h>
#include <kcmdlineargs.h> #include <tdecmdlineargs.h>
#include <klocale.h> #include <tdelocale.h>
static const char description[] = static const char description[] =
@ -33,11 +33,11 @@ static const char description[] =
static const char version[] = "0.5.3"; static const char version[] = "0.5.3";
static KCmdLineOptions options[] = static TDECmdLineOptions options[] =
{ {
{ "nosystray", I18N_NOOP( "Do not show the systray icon" ), 0 }, { "nosystray", I18N_NOOP( "Do not show the systray icon" ), 0 },
{ "singleshot", I18N_NOOP( "Display the default view and exit (non daemon mode)" ), 0 }, { "singleshot", I18N_NOOP( "Display the default view and exit (non daemon mode)" ), 0 },
KCmdLineLastOption TDECmdLineLastOption
}; };
void myMessageOutput( TQtMsgType type, const char *msg ) void myMessageOutput( TQtMsgType type, const char *msg )
@ -61,16 +61,16 @@ int main(int argc, char **argv)
{ {
// qInstallMsgHandler( myMessageOutput ); // qInstallMsgHandler( myMessageOutput );
KAboutData about("kompose", I18N_NOOP("Kompose"), version, description, TDEAboutData about("kompose", I18N_NOOP("Kompose"), version, description,
KAboutData::License_GPL, "(C) 2005 Hans Oischinger", "", "http://developer.berlios.de/projects/kompose", "hans.oischinger@kde-mail.net"); TDEAboutData::License_GPL, "(C) 2005 Hans Oischinger", "", "http://developer.berlios.de/projects/kompose", "hans.oischinger@kde-mail.net");
about.addAuthor( "Hans Oischinger", 0, "hans.oischinger@kde-mail.net" ); about.addAuthor( "Hans Oischinger", 0, "hans.oischinger@kde-mail.net" );
KCmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
KCmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
Kompose *app = new Kompose(); Kompose *app = new Kompose();
// no session.. just start up normally // no session.. just start up normally
KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if ( !args->isSet("systray") ) if ( !args->isSet("systray") )
{ {

Write Preview
Loading…
Cancel
Save