Automated conversion to TQt and TDE APIs

master
Timothy Pearson 11 years ago
parent decdf3663d
commit afe05794c4

@ -1 +1 @@
2007/2/18 Version 0.2: Now shipping tracker.h and tracker-client.h from tracker-0.5.4 to build against. This is just a temporary hack and kio-find will probably not work with tracker-0.6. 2007/2/18 Version 0.2: Now shipping tracker.h and tracker-client.h from tracker-0.5.4 to build against. This is just a temporary hack and tdeio-find will probably not work with tracker-0.6.

@ -150,7 +150,7 @@ operates.
`--help' `--help'
Print a summary of the options to `configure', and exit. Print a summary of the options to `configure', and exit.
`--quiet' `--tquiet'
`--silent' `--silent'
`-q' `-q'
Do not print messages saying which checks are being made. Do not print messages saying which checks are being made.

@ -23,8 +23,8 @@ dnl IMPORTANT NOTE:
dnl Please do not modify this file unless you expect your modifications to be dnl Please do not modify this file unless you expect your modifications to be
dnl carried into every other module in the repository. dnl carried into every other module in the repository.
dnl dnl
dnl Single-module modifications are best placed in configure.in for kdelibs dnl Single-module modifications are best placed in configure.in for tdelibs
dnl and kdebase or configure.in.in if present. dnl and tdebase or configure.in.in if present.
# KDE_PATH_X_DIRECT # KDE_PATH_X_DIRECT
dnl Internal subroutine of AC_PATH_X. dnl Internal subroutine of AC_PATH_X.
@ -103,41 +103,41 @@ ac_x_libraries=],
[LIBS="$ac_save_LIBS" [LIBS="$ac_save_LIBS"
# First see if replacing the include by lib works. # First see if replacing the include by lib works.
# Check X11 before X11Rn because it is often a symlink to the current release. # Check X11 before X11Rn because it is often a symlink to the current release.
for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \ for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \
/usr/X11/lib${kdelibsuff} \ /usr/X11/lib${tdelibsuff} \
/usr/X11R6/lib${kdelibsuff} \ /usr/X11R6/lib${tdelibsuff} \
/usr/X11R5/lib${kdelibsuff} \ /usr/X11R5/lib${tdelibsuff} \
/usr/X11R4/lib${kdelibsuff} \ /usr/X11R4/lib${tdelibsuff} \
\ \
/usr/lib${kdelibsuff}/X11 \ /usr/lib${tdelibsuff}/X11 \
/usr/lib${kdelibsuff}/X11R6 \ /usr/lib${tdelibsuff}/X11R6 \
/usr/lib${kdelibsuff}/X11R5 \ /usr/lib${tdelibsuff}/X11R5 \
/usr/lib${kdelibsuff}/X11R4 \ /usr/lib${tdelibsuff}/X11R4 \
\ \
/usr/local/X11/lib${kdelibsuff} \ /usr/local/X11/lib${tdelibsuff} \
/usr/local/X11R6/lib${kdelibsuff} \ /usr/local/X11R6/lib${tdelibsuff} \
/usr/local/X11R5/lib${kdelibsuff} \ /usr/local/X11R5/lib${tdelibsuff} \
/usr/local/X11R4/lib${kdelibsuff} \ /usr/local/X11R4/lib${tdelibsuff} \
\ \
/usr/local/lib${kdelibsuff}/X11 \ /usr/local/lib${tdelibsuff}/X11 \
/usr/local/lib${kdelibsuff}/X11R6 \ /usr/local/lib${tdelibsuff}/X11R6 \
/usr/local/lib${kdelibsuff}/X11R5 \ /usr/local/lib${tdelibsuff}/X11R5 \
/usr/local/lib${kdelibsuff}/X11R4 \ /usr/local/lib${tdelibsuff}/X11R4 \
\ \
/usr/X386/lib${kdelibsuff} \ /usr/X386/lib${tdelibsuff} \
/usr/x386/lib${kdelibsuff} \ /usr/x386/lib${tdelibsuff} \
/usr/XFree86/lib${kdelibsuff}/X11 \ /usr/XFree86/lib${tdelibsuff}/X11 \
\ \
/usr/lib${kdelibsuff} \ /usr/lib${tdelibsuff} \
/usr/local/lib${kdelibsuff} \ /usr/local/lib${tdelibsuff} \
/usr/unsupported/lib${kdelibsuff} \ /usr/unsupported/lib${tdelibsuff} \
/usr/athena/lib${kdelibsuff} \ /usr/athena/lib${tdelibsuff} \
/usr/local/x11r5/lib${kdelibsuff} \ /usr/local/x11r5/lib${tdelibsuff} \
/usr/lpp/Xamples/lib${kdelibsuff} \ /usr/lpp/Xamples/lib${tdelibsuff} \
/lib/usr/lib${kdelibsuff}/X11 \ /lib/usr/lib${tdelibsuff}/X11 \
\ \
/usr/openwin/lib${kdelibsuff} \ /usr/openwin/lib${tdelibsuff} \
/usr/openwin/share/lib${kdelibsuff} \ /usr/openwin/share/lib${tdelibsuff} \
; \ ; \
do do
dnl Don't even attempt the hair of trying to link an X program! dnl Don't even attempt the hair of trying to link an X program!
@ -371,24 +371,24 @@ AC_DEFUN([KDE_1_CHECK_PATHS],
fi fi
AC_MSG_CHECKING([for KDE libraries installed]) AC_MSG_CHECKING([for KDE libraries installed])
ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5' ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5'
if AC_TRY_EVAL(ac_link) && test -s conftest; then if AC_TRY_EVAL(ac_link) && test -s conftest; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
else else
AC_MSG_ERROR([your system fails at linking a small KDE application! AC_MSG_ERROR([your system fails at linking a small KDE application!
Check, if your compiler is installed correctly and if you have used the Check, if your compiler is installed correctly and if you have used the
same compiler to compile Qt and kdelibs as you did use now. same compiler to compile Qt and tdelibs as you did use now.
For more details about this problem, look at the end of config.log.]) For more details about this problem, look at the end of config.log.])
fi fi
if eval `KDEDIR= ./conftest 2>&5`; then if eval `TDEDIR= ./conftest 2>&5`; then
kde_result=done kde_result=done
else else
kde_result=problems kde_result=problems
fi fi
KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
kde_have_all_paths=yes kde_have_all_paths=yes
KDE_SET_PATHS($kde_result) KDE_SET_PATHS($kde_result)
@ -547,11 +547,11 @@ Please check whether you installed aRts correctly or use
AC_DEFUN([KDE_SET_DEFAULT_BINDIRS], AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
[ [
kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin" kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs" test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
if test -n "$KDEDIRS"; then if test -n "$TDEDIRS"; then
kde_save_IFS=$IFS kde_save_IFS=$IFS
IFS=: IFS=:
for dir in $KDEDIRS; do for dir in $TDEDIRS; do
kde_default_bindirs="$dir/bin $kde_default_bindirs " kde_default_bindirs="$dir/bin $kde_default_bindirs "
done done
IFS=$kde_save_IFS IFS=$kde_save_IFS
@ -602,18 +602,18 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi fi
if test -n "$kde32ornewer"; then if test -n "$kde32ornewer"; then
KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)]) KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
fi fi
if test -n "$kde33ornewer"; then if test -n "$kde33ornewer"; then
KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)]) KDE_FIND_PATH(maketdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(maketdewidgets)])
AC_SUBST(MAKEKDEWIDGETS) AC_SUBST(MAKEKDEWIDGETS)
fi fi
KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""]) KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then if test -n "$MEINPROC" -a "$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=""
@ -710,7 +710,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
@ -937,7 +937,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
@ -1325,7 +1325,7 @@ AC_ARG_ENABLE(
USING_QT_MT="" USING_QT_MT=""
dnl ------------------------------------------------------------------------ dnl ------------------------------------------------------------------------
dnl If we not get --disable-qt-mt then adjust some vars for the host. dnl If we not get --disable-tqt-mt then adjust some vars for the host.
dnl ------------------------------------------------------------------------ dnl ------------------------------------------------------------------------
KDE_MT_LDFLAGS= KDE_MT_LDFLAGS=
@ -1383,7 +1383,7 @@ dnl ------------------------------------------------------------
fi fi
dnl ------------------------------------------------------------------------ dnl ------------------------------------------------------------------------
dnl If we got --enable-qt-mt then adjust the Qt library name for the host. dnl If we got --enable-tqt-mt then adjust the Qt library name for the host.
dnl ------------------------------------------------------------------------ dnl ------------------------------------------------------------------------
if test "x$kde_use_qt_mt" = "xyes"; then if test "x$kde_use_qt_mt" = "xyes"; then
@ -1418,7 +1418,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
]) ])
@ -1459,7 +1459,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
@ -1644,11 +1644,11 @@ rm -f actest.ui actest.cpp
AC_MSG_RESULT([$kde_cv_uic_plugins]) AC_MSG_RESULT([$kde_cv_uic_plugins])
if test "$kde_cv_uic_plugins" != yes; then if test "$kde_cv_uic_plugins" != yes; then
AC_MSG_ERROR([ AC_MSG_ERROR([
you need to install kdelibs first. you need to install tdelibs first.
If you did install kdelibs, then the Qt version that is picked up by If you did install tdelibs, then the Qt version that is picked up by
this configure is not the same version you used to compile kdelibs. this configure is not the same version you used to compile tdelibs.
The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the
_same Qt version_, compiled with the _same compiler_ and the same Qt _same Qt version_, compiled with the _same compiler_ and the same Qt
configuration settings. configuration settings.
]) ])
@ -1785,16 +1785,16 @@ AC_CACHE_VAL(ac_cv_have_kde,
if test "$kde_qtver" = 1; then if test "$kde_qtver" = 1; then
kde_check_header="ksock.h" kde_check_header="ksock.h"
kde_check_lib="libkdecore.la" kde_check_lib="libtdecore.la"
else else
kde_check_header="ksharedptr.h" kde_check_header="ksharedptr.h"
kde_check_lib="libkio.la" kde_check_lib="libtdeio.la"
fi fi
if test -z "$1"; then if test -z "$1"; then
kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs" test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs"
kde_incdirs="$ac_kde_includes $kde_incdirs" kde_incdirs="$ac_kde_includes $kde_incdirs"
AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir) AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
ac_kde_includes="$kde_incdir" ac_kde_includes="$kde_incdir"
@ -1805,8 +1805,8 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail.
So, check this please and use another prefix!]) So, check this please and use another prefix!])
fi fi
kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}"
test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs" test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs"
kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir) AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
ac_kde_libraries="$kde_libdir" ac_kde_libraries="$kde_libdir"
@ -1824,7 +1824,7 @@ 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/kdewidgets.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
@ -1839,7 +1839,7 @@ else
ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries" ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
fi fi
else dnl test -z $1, e.g. from kdelibs else dnl test -z $1, e.g. from tdelibs
ac_cv_have_kde="have_kde=no" ac_cv_have_kde="have_kde=no"
@ -1979,20 +1979,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");
@ -2030,7 +2030,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
kde_cxxflags_safe="$CXXFLAGS" kde_cxxflags_safe="$CXXFLAGS"
LIBS="-lkde-qt-addon $LIBQT $LIBS" LIBS="-lkde-qt-addon $LIBQT $LIBS"
CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes" CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes"
LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS" LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
AC_TRY_LINK([ AC_TRY_LINK([
@ -2064,48 +2064,48 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
if test $kde_qtver = 3; then if test $kde_qtver = 3; then
case $host in case $host in
*cygwin*) lib_kded="-lkdeinit_kded" ;; *cygwin*) lib_kded="-ltdeinit_kded" ;;
*) lib_kded="" ;; *) lib_kded="" ;;
esac esac
AC_SUBST(LIB_KDED, $lib_kded) AC_SUBST(LIB_KDED, $lib_kded)
AC_SUBST(LIB_KDECORE, "-lkdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_KDEUI, "-lkdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lkabc") AC_SUBST(LIB_KABC, "-ltdeabc")
AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_KDEPRINT, "-lkdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-lkutils") AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
AC_SUBST(LIB_KDEPIM, "-lkdepim") AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-lkimproxy") AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-lkdnssd") AC_SUBST(LIB_TDEDNSSD, "-ltdednssd")
AC_SUBST(LIB_KUNITTEST, "-lkunittest") AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest")
# 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
]) ])
@ -2170,7 +2170,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
@ -2489,7 +2489,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
]) ])
@ -2547,7 +2547,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
@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)" KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
AC_SUBST(KDE_PLUGIN) AC_SUBST(KDE_PLUGIN)
# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs. # This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)" KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
AC_SUBST(KDE_CHECK_PLUGIN) AC_SUBST(KDE_CHECK_PLUGIN)
@ -3502,9 +3502,9 @@ AC_DEFUN([KDE_CHECK_LIB64],
AC_ARG_ENABLE(libsuffix, AC_ARG_ENABLE(libsuffix,
AC_HELP_STRING([--enable-libsuffix], AC_HELP_STRING([--enable-libsuffix],
[/lib directory suffix (64,32,none,auto[=default])]), [/lib directory suffix (64,32,none,auto[=default])]),
kdelibsuff=$enableval, kdelibsuff="auto") tdelibsuff=$enableval, tdelibsuff="auto")
if test "$kdelibsuff" = "auto"; then if test "$tdelibsuff" = "auto"; then
cat > conftest.c << EOF cat > conftest.c << EOF
#include <stdio.h> #include <stdio.h>
@ -3512,26 +3512,26 @@ int main() {
return 0; return 0;
} }
EOF EOF
kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ tdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
s,.*/lib\([[^\/]]*\)/.*,\1, s,.*/lib\([[^\/]]*\)/.*,\1,
p p
}'` }'`
rm -rf conftest.* rm -rf conftest.*
fi fi
if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then if test "$tdelibsuff" = "no" || test "$tdelibsuff" = "none"; 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
]) ])
@ -3549,7 +3549,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
@ -4556,7 +4556,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)
@ -4946,14 +4946,14 @@ AC_DEFUN([KDE_CONF_FILES],
AC_SUBST(CONF_FILES) AC_SUBST(CONF_FILES)
])dnl ])dnl
dnl This sets the prefix, for arts and kdelibs dnl This sets the prefix, for arts and tdelibs
dnl Do NOT use in any other module. dnl Do NOT use in any other module.
dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde dnl It only looks at --prefix, TDEDIR and falls back to /usr/local/kde
AC_DEFUN([KDE_SET_PREFIX_CORE], AC_DEFUN([KDE_SET_PREFIX_CORE],
[ [
unset CDPATH unset CDPATH
dnl make $KDEDIR the default for the installation dnl make $TDEDIR the default for the installation
AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
if test "x$prefix" = "xNONE"; then if test "x$prefix" = "xNONE"; then
prefix=$ac_default_prefix prefix=$ac_default_prefix
@ -4977,25 +4977,25 @@ AC_DEFUN([KDE_SET_PREFIX],
unset CDPATH unset CDPATH
dnl We can't give real code to that macro, only a value. dnl We can't give real code to that macro, only a value.
dnl It only matters for --help, since we set the prefix in this function anyway. dnl It only matters for --help, since we set the prefix in this function anyway.
AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix}) AC_PREFIX_DEFAULT(${TDEDIR:-the kde prefix})
KDE_SET_DEFAULT_BINDIRS KDE_SET_DEFAULT_BINDIRS
if test "x$prefix" = "xNONE"; then if test "x$prefix" = "xNONE"; then
dnl no prefix given: look for kde-config in the PATH and deduce the prefix from it dnl no prefix given: look for tde-config in the PATH and deduce the prefix from it
KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend) KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend)
else else
dnl prefix given: look for kde-config, preferrably in prefix, otherwise in PATH dnl prefix given: look for tde-config, preferrably in prefix, otherwise in PATH
kde_save_PATH="$PATH" kde_save_PATH="$PATH"
PATH="$exec_prefix/bin:$prefix/bin:$PATH" PATH="$exec_prefix/bin:$prefix/bin:$PATH"
KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend) KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend)
PATH="$kde_save_PATH" PATH="$kde_save_PATH"
fi fi
kde_libs_prefix=`$KDECONFIG --prefix` kde_libs_prefix=`$KDECONFIG --prefix`
if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs. AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs.
This means it has been moved since you installed it. This means it has been moved since you installed it.
This won't work. Please recompile kdelibs for the new prefix. This won't work. Please recompile tdelibs for the new prefix.
]) ])
fi fi
kde_libs_htmldir=`$KDECONFIG --install html --expandvars` kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
@ -5003,7 +5003,7 @@ AC_DEFUN([KDE_SET_PREFIX],
AC_MSG_CHECKING([where to install]) AC_MSG_CHECKING([where to install])
if test "x$prefix" = "xNONE"; then if test "x$prefix" = "xNONE"; then
prefix=$kde_libs_prefix prefix=$kde_libs_prefix
AC_MSG_RESULT([$prefix (as returned by kde-config)]) AC_MSG_RESULT([$prefix (as returned by tde-config)])
else else
dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different
given_prefix=$prefix given_prefix=$prefix
@ -5660,7 +5660,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
@ -5680,7 +5680,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
@ -5917,9 +5917,9 @@ dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page
dnl also defines KSTUFF_PKG_ERRORS on error dnl also defines KSTUFF_PKG_ERRORS on error
AC_DEFUN([KDE_PKG_CHECK_MODULES], [ AC_DEFUN([KDE_PKG_CHECK_MODULES], [
PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" PKG_CONFIG_PATH="$prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
if test "$prefix" != "$kde_libs_prefix"; then if test "$prefix" != "$kde_libs_prefix"; then
PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" PKG_CONFIG_PATH="$kde_libs_prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
fi fi
export PKG_CONFIG_PATH export PKG_CONFIG_PATH
PKG_CHECK_MODULES([$1],[$2],[$3],[$4]) PKG_CHECK_MODULES([$1],[$2],[$3],[$4])
@ -10384,7 +10384,7 @@ EOF
# Now try to grab the symbols. # Now try to grab the symbols.
nlist=conftest.nm nlist=conftest.nm
if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
# Try sorting and uniquifying the output. # Try sorting and unitquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist" mv -f "$nlist"T "$nlist"
else else

@ -731,7 +731,7 @@ PACKAGE_STRING=
PACKAGE_BUGREPORT= PACKAGE_BUGREPORT=
ac_unique_file="acinclude.m4" ac_unique_file="acinclude.m4"
ac_default_prefix=${KDEDIR:-the kde prefix} ac_default_prefix=${TDEDIR:-the kde prefix}
# Factoring default headers for most tests. # Factoring default headers for most tests.
ac_includes_default="\ ac_includes_default="\
#include <stdio.h> #include <stdio.h>
@ -986,28 +986,28 @@ kde_templatesdir
kde_servicesdir kde_servicesdir
kde_servicetypesdir kde_servicetypesdir
kde_moduledir kde_moduledir
kdeinitdir tdeinitdir
kde_styledir kde_styledir
kde_widgetdir kde_widgetdir
LIB_KDED LIB_KDED
LIB_KDECORE LIB_TDECORE
LIB_KDEUI LIB_TDEUI
LIB_KIO LIB_TDEIO
LIB_KJS LIB_KJS
LIB_SMB LIB_SMB
LIB_KAB LIB_KAB
LIB_KABC LIB_KABC
LIB_KHTML LIB_TDEHTML
LIB_KSPELL LIB_TDESPELL
LIB_KPARTS LIB_TDEPARTS
LIB_KDEPRINT LIB_TDEPRINT
LIB_KUTILS LIB_TDEUTILS
LIB_KDEPIM LIB_TDEPIM
LIB_KIMPROXY LIB_TDEIMPROXY
LIB_KNEWSTUFF LIB_KNEWSTUFF
LIB_KDNSSD LIB_TDEDNSSD
LIB_KUNITTEST LIB_TDEUNITTEST
LIB_KSYCOCA LIB_TDESYCOCA
LIB_KFILE LIB_KFILE
LIB_KFM LIB_KFM
TOPSUBDIRS TOPSUBDIRS
@ -1299,7 +1299,7 @@ do
-psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
psdir=$ac_optarg ;; psdir=$ac_optarg ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \ -q | -tquiet | --tquiet | --tquie | --tqui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil) | -silent | --silent | --silen | --sile | --sil)
silent=yes ;; silent=yes ;;
@ -1546,7 +1546,7 @@ Configuration:
--help=short display options specific to this package --help=short display options specific to this package
--help=recursive display the short help of all the included packages --help=recursive display the short help of all the included packages
-V, --version display version information and exit -V, --version display version information and exit
-q, --quiet, --silent do not print \`checking...' messages -q, --tquiet, --silent do not print \`checking...' messages
--cache-file=FILE cache test results in FILE [disabled] --cache-file=FILE cache test results in FILE [disabled]
-C, --config-cache alias for \`--cache-file=config.cache' -C, --config-cache alias for \`--cache-file=config.cache'
-n, --no-create do not create output files -n, --no-create do not create output files
@ -1816,7 +1816,7 @@ do
do do
case $ac_arg in case $ac_arg in
-no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \ -q | -tquiet | --tquiet | --tquie | --tqui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil) | -silent | --silent | --silen | --sile | --sil)
continue ;; continue ;;
*\'*) *\'*)
@ -1832,7 +1832,7 @@ do
case $ac_arg in case $ac_arg in
*=* | --config-cache | -C | -disable-* | --disable-* \ *=* | --config-cache | -C | -disable-* | --disable-* \
| -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
| -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ | -q | -tquiet | --q* | -silent | --sil* | -v | -verb* \
| -with-* | --with-* | -without-* | --without-* | --x) | -with-* | --with-* | -without-* | --without-* | --x)
case "$ac_configure_args0 " in case "$ac_configure_args0 " in
"$ac_configure_args1"*" '$ac_arg' "* ) continue ;; "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
@ -2725,11 +2725,11 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin" kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs" test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
if test -n "$KDEDIRS"; then if test -n "$TDEDIRS"; then
kde_save_IFS=$IFS kde_save_IFS=$IFS
IFS=: IFS=:
for dir in $KDEDIRS; do for dir in $TDEDIRS; do
kde_default_bindirs="$dir/bin $kde_default_bindirs " kde_default_bindirs="$dir/bin $kde_default_bindirs "
done done
IFS=$kde_save_IFS IFS=$kde_save_IFS
@ -2737,12 +2737,12 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
if test "x$prefix" = "xNONE"; then if test "x$prefix" = "xNONE"; then
{ echo "$as_me:$LINENO: checking for kde-config" >&5 { echo "$as_me:$LINENO: checking for tde-config" >&5
echo $ECHO_N "checking for kde-config... $ECHO_C" >&6; } echo $ECHO_N "checking for tde-config... $ECHO_C" >&6; }
if test -n "$KDECONFIG"; then if test -n "$KDECONFIG"; then
kde_cv_path="$KDECONFIG"; kde_cv_path="$KDECONFIG";
else else
kde_cache=`echo kde-config | sed 'y%./+-%__p_%'` kde_cache=`echo tde-config | sed 'y%./+-%__p_%'`
if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
@ -2761,16 +2761,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
@ -2790,10 +2790,10 @@ fi
{ echo "$as_me:$LINENO: result: not found" >&5 { echo "$as_me:$LINENO: result: not found" >&5
echo "${ECHO_T}not found" >&6; } echo "${ECHO_T}not found" >&6; }
{ { echo "$as_me:$LINENO: error: The important program kde-config was not found! { { echo "$as_me:$LINENO: error: The important program tde-config was not found!
Please check whether you installed KDE correctly. Please check whether you installed KDE correctly.
" >&5 " >&5
echo "$as_me: error: The important program kde-config was not found! echo "$as_me: error: The important program tde-config was not found!
Please check whether you installed KDE correctly. Please check whether you installed KDE correctly.
" >&2;} " >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
@ -2809,12 +2809,12 @@ echo "${ECHO_T}$kde_cv_path" >&6; }
kde_save_PATH="$PATH" kde_save_PATH="$PATH"
PATH="$exec_prefix/bin:$prefix/bin:$PATH" PATH="$exec_prefix/bin:$prefix/bin:$PATH"
{ echo "$as_me:$LINENO: checking for kde-config" >&5 { echo "$as_me:$LINENO: checking for tde-config" >&5
echo $ECHO_N "checking for kde-config... $ECHO_C" >&6; } echo $ECHO_N "checking for tde-config... $ECHO_C" >&6; }
if test -n "$KDECONFIG"; then if test -n "$KDECONFIG"; then
kde_cv_path="$KDECONFIG"; kde_cv_path="$KDECONFIG";
else else
kde_cache=`echo kde-config | sed 'y%./+-%__p_%'` kde_cache=`echo tde-config | sed 'y%./+-%__p_%'`
if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
@ -2833,16 +2833,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
@ -2862,10 +2862,10 @@ fi
{ echo "$as_me:$LINENO: result: not found" >&5 { echo "$as_me:$LINENO: result: not found" >&5
echo "${ECHO_T}not found" >&6; } echo "${ECHO_T}not found" >&6; }
{ { echo "$as_me:$LINENO: error: The important program kde-config was not found! { { echo "$as_me:$LINENO: error: The important program tde-config was not found!
Please check whether you installed KDE correctly. Please check whether you installed KDE correctly.
" >&5 " >&5
echo "$as_me: error: The important program kde-config was not found! echo "$as_me: error: The important program tde-config was not found!
Please check whether you installed KDE correctly. Please check whether you installed KDE correctly.
" >&2;} " >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
@ -2882,13 +2882,13 @@ echo "${ECHO_T}$kde_cv_path" >&6; }
kde_libs_prefix=`$KDECONFIG --prefix` kde_libs_prefix=`$KDECONFIG --prefix`
if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
{ { echo "$as_me:$LINENO: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs. { { echo "$as_me:$LINENO: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs.
This means it has been moved since you installed it. This means it has been moved since you installed it.
This won't work. Please recompile kdelibs for the new prefix. This won't work. Please recompile tdelibs for the new prefix.
" >&5 " >&5
echo "$as_me: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs. echo "$as_me: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs.
This means it has been moved since you installed it. This means it has been moved since you installed it.
This won't work. Please recompile kdelibs for the new prefix. This won't work. Please recompile tdelibs for the new prefix.
" >&2;} " >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
@ -2898,8 +2898,8 @@ echo "$as_me: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_
echo $ECHO_N "checking where to install... $ECHO_C" >&6; } echo $ECHO_N "checking where to install... $ECHO_C" >&6; }
if test "x$prefix" = "xNONE"; then if test "x$prefix" = "xNONE"; then
prefix=$kde_libs_prefix prefix=$kde_libs_prefix
{ echo "$as_me:$LINENO: result: $prefix (as returned by kde-config)" >&5 { echo "$as_me:$LINENO: result: $prefix (as returned by tde-config)" >&5
echo "${ECHO_T}$prefix (as returned by kde-config)" >&6; } echo "${ECHO_T}$prefix (as returned by tde-config)" >&6; }
else else
given_prefix=$prefix given_prefix=$prefix
{ echo "$as_me:$LINENO: result: $prefix (as requested)" >&5 { echo "$as_me:$LINENO: result: $prefix (as requested)" >&5
@ -7651,13 +7651,13 @@ fi
# Check whether --enable-libsuffix was given. # Check whether --enable-libsuffix was given.
if test "${enable_libsuffix+set}" = set; then if test "${enable_libsuffix+set}" = set; then
enableval=$enable_libsuffix; kdelibsuff=$enableval enableval=$enable_libsuffix; tdelibsuff=$enableval
else else
kdelibsuff="auto" tdelibsuff="auto"
fi fi
if test "$kdelibsuff" = "auto"; then if test "$tdelibsuff" = "auto"; then
cat > conftest.c << EOF cat > conftest.c << EOF
#include <stdio.h> #include <stdio.h>
@ -7665,17 +7665,17 @@ int main() {
return 0; return 0;
} }
EOF EOF
kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ tdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
s,.*/lib\([^\/]*\)/.*,\1, s,.*/lib\([^\/]*\)/.*,\1,
p p
}'` }'`
rm -rf conftest.* rm -rf conftest.*
fi fi
if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then if test "$tdelibsuff" = "no" || test "$tdelibsuff" = "none"; 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; }
@ -7685,16 +7685,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 was given. # Check whether --enable-fast-install was given.
@ -8882,8 +8882,8 @@ echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
no:yes:* ) no:yes:* )
{ echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing preretquisite headers?" >&5
echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} echo "$as_me: WARNING: $ac_header: check for missing preretquisite headers?" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
@ -9352,7 +9352,7 @@ EOF
ac_status=$? ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s "$nlist"; then (exit $ac_status); } && test -s "$nlist"; then
# Try sorting and uniquifying the output. # Try sorting and unitquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist" mv -f "$nlist"T "$nlist"
else else
@ -22591,7 +22591,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)" KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs. # This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)" KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
@ -23023,7 +23023,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
@ -23234,7 +23234,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
@ -24620,8 +24620,8 @@ echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
no:yes:* ) no:yes:* )
{ echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing preretquisite headers?" >&5
echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} echo "$as_me: WARNING: $ac_header: check for missing preretquisite headers?" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
@ -24762,8 +24762,8 @@ echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
no:yes:* ) no:yes:* )
{ echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing preretquisite headers?" >&5
echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} echo "$as_me: WARNING: $ac_header: check for missing preretquisite headers?" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
@ -24971,8 +24971,8 @@ echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
no:yes:* ) no:yes:* )
{ echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing preretquisite headers?" >&5
echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} echo "$as_me: WARNING: $ac_header: check for missing preretquisite headers?" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
@ -25108,8 +25108,8 @@ echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the compiler's res
no:yes:* ) no:yes:* )
{ echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: present but cannot be compiled" >&5 { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: present but cannot be compiled" >&5
echo "$as_me: WARNING: CoreAudio/CoreAudio.h: present but cannot be compiled" >&2;} echo "$as_me: WARNING: CoreAudio/CoreAudio.h: present but cannot be compiled" >&2;}
{ echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: check for missing prerequisite headers?" >&5 { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: check for missing preretquisite headers?" >&5
echo "$as_me: WARNING: CoreAudio/CoreAudio.h: check for missing prerequisite headers?" >&2;} echo "$as_me: WARNING: CoreAudio/CoreAudio.h: check for missing preretquisite headers?" >&2;}
{ echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: see the Autoconf documentation" >&5 { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: see the Autoconf documentation" >&5
echo "$as_me: WARNING: CoreAudio/CoreAudio.h: see the Autoconf documentation" >&2;} echo "$as_me: WARNING: CoreAudio/CoreAudio.h: see the Autoconf documentation" >&2;}
{ echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: section \"Present But Cannot Be Compiled\"" >&5 { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: section \"Present But Cannot Be Compiled\"" >&5
@ -25313,7 +25313,7 @@ if test "x$kde_cv_func_res_init" = xyes; then
else else
case "res_init" in case "res_init" in
setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat) setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
kde_cv_proto_res_init="yes - in libkdefakes" kde_cv_proto_res_init="yes - in libtdefakes"
;; ;;
*) *)
kde_cv_proto_res_init=unknown kde_cv_proto_res_init=unknown
@ -28418,8 +28418,8 @@ echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
no:yes:* ) no:yes:* )
{ echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing preretquisite headers?" >&5
echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} echo "$as_me: WARNING: $ac_header: check for missing preretquisite headers?" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
@ -28853,41 +28853,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
@ -28952,7 +28952,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
@ -30303,7 +30303,7 @@ qt_includes=""
# Check whether --with-qt-dir was given. # Check whether --with-qt-dir was given.
if test "${with_qt_dir+set}" = set; then if test "${with_qt_dir+set}" = set; then
withval=$with_qt_dir; ac_qt_includes="$withval"/include withval=$with_qt_dir; 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
@ -30368,7 +30368,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
@ -31169,16 +31169,16 @@ else
if test "$kde_qtver" = 1; then if test "$kde_qtver" = 1; then
kde_check_header="ksock.h" kde_check_header="ksock.h"
kde_check_lib="libkdecore.la" kde_check_lib="libtdecore.la"
else else
kde_check_header="ksharedptr.h" kde_check_header="ksharedptr.h"
kde_check_lib="libkio.la" kde_check_lib="libtdeio.la"
fi fi
if test -z ""; then if test -z ""; then
kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs" test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs"
kde_incdirs="$ac_kde_includes $kde_incdirs" kde_incdirs="$ac_kde_includes $kde_incdirs"
kde_incdir=NO kde_incdir=NO
@ -31207,8 +31207,8 @@ So, check this please and use another prefix!" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}"
test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs" test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs"
kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
kde_libdir=NO kde_libdir=NO
@ -31257,10 +31257,10 @@ 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/kdewidgets.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
@ -31394,20 +31394,20 @@ fi
echo "${ECHO_T}$kde_cv_uic_plugins" >&6; } echo "${ECHO_T}$kde_cv_uic_plugins" >&6; }
if test "$kde_cv_uic_plugins" != yes; then if test "$kde_cv_uic_plugins" != yes; then
{ { echo "$as_me:$LINENO: error: { { echo "$as_me:$LINENO: error:
you need to install kdelibs first. you need to install tdelibs first.
If you did install kdelibs, then the Qt version that is picked up by If you did install tdelibs, then the Qt version that is picked up by
this configure is not the same version you used to compile kdelibs. this configure is not the same version you used to compile tdelibs.
The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the
_same Qt version_, compiled with the _same compiler_ and the same Qt _same Qt version_, compiled with the _same compiler_ and the same Qt
configuration settings. configuration settings.
" >&5 " >&5
echo "$as_me: error: echo "$as_me: error:
you need to install kdelibs first. you need to install tdelibs first.
If you did install kdelibs, then the Qt version that is picked up by If you did install tdelibs, then the Qt version that is picked up by
this configure is not the same version you used to compile kdelibs. this configure is not the same version you used to compile tdelibs.
The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the
_same Qt version_, compiled with the _same compiler_ and the same Qt _same Qt version_, compiled with the _same compiler_ and the same Qt
configuration settings. configuration settings.
" >&2;} " >&2;}
@ -31582,20 +31582,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");
@ -31658,7 +31658,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
@ -31670,22 +31670,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
@ -31884,20 +31884,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");
@ -31960,7 +31960,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
@ -31972,22 +31972,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
@ -32096,11 +32096,11 @@ _ACEOF
kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin" kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs" test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
if test -n "$KDEDIRS"; then if test -n "$TDEDIRS"; then
kde_save_IFS=$IFS kde_save_IFS=$IFS
IFS=: IFS=:
for dir in $KDEDIRS; do for dir in $TDEDIRS; do
kde_default_bindirs="$dir/bin $kde_default_bindirs " kde_default_bindirs="$dir/bin $kde_default_bindirs "
done done
IFS=$kde_save_IFS IFS=$kde_save_IFS
@ -32474,12 +32474,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 { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
@ -32498,16 +32498,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
@ -32527,10 +32527,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; }; }
@ -32614,12 +32614,12 @@ echo "${ECHO_T}$kde_cv_path" >&6; }
fi fi
if test -n "$kde33ornewer"; then if test -n "$kde33ornewer"; then
{ echo "$as_me:$LINENO: checking for makekdewidgets" >&5 { echo "$as_me:$LINENO: checking for maketdewidgets" >&5
echo $ECHO_N "checking for makekdewidgets... $ECHO_C" >&6; } echo $ECHO_N "checking for maketdewidgets... $ECHO_C" >&6; }
if test -n "$MAKEKDEWIDGETS"; then if test -n "$MAKEKDEWIDGETS"; then
kde_cv_path="$MAKEKDEWIDGETS"; kde_cv_path="$MAKEKDEWIDGETS";
else else
kde_cache=`echo makekdewidgets | sed 'y%./+-%__p_%'` kde_cache=`echo maketdewidgets | sed 'y%./+-%__p_%'`
if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
@ -32638,16 +32638,16 @@ else
IFS=$kde_save_IFS IFS=$kde_save_IFS
for dir in $dirs; do for dir in $dirs; do
if test -x "$dir/makekdewidgets"; then if test -x "$dir/maketdewidgets"; then
if test -n "" if test -n ""
then then
evalstr="$dir/makekdewidgets 2>&1 " evalstr="$dir/maketdewidgets 2>&1 "
if eval $evalstr; then if eval $evalstr; then
kde_cv_path="$dir/makekdewidgets" kde_cv_path="$dir/maketdewidgets"
break break
fi fi
else else
kde_cv_path="$dir/makekdewidgets" kde_cv_path="$dir/maketdewidgets"
break break
fi fi
fi fi
@ -32667,10 +32667,10 @@ fi
{ echo "$as_me:$LINENO: result: not found" >&5 { echo "$as_me:$LINENO: result: not found" >&5
echo "${ECHO_T}not found" >&6; } echo "${ECHO_T}not found" >&6; }
{ { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found! { { echo "$as_me:$LINENO: error: The important program maketdewidgets was not found!
Please check whether you installed KDE correctly. Please check whether you installed KDE correctly.
" >&5 " >&5
echo "$as_me: error: The important program makekdewidgets was not found! echo "$as_me: error: The important program maketdewidgets was not found!
Please check whether you installed KDE correctly. Please check whether you installed KDE correctly.
" >&2;} " >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
@ -32748,7 +32748,7 @@ echo "${ECHO_T}$kde_cv_path" >&6; }
if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then if test -n "$MEINPROC" -a "$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;
@ -32810,7 +32810,7 @@ done
kdeinitdir='$(kde_moduledir)' tdeinitdir='$(kde_moduledir)'
@ -32829,16 +32829,16 @@ fi
if test $kde_qtver = 3; then if test $kde_qtver = 3; then
case $host in case $host in
*cygwin*) lib_kded="-lkdeinit_kded" ;; *cygwin*) lib_kded="-ltdeinit_kded" ;;
*) lib_kded="" ;; *) lib_kded="" ;;
esac esac
LIB_KDED=$lib_kded LIB_KDED=$lib_kded
LIB_KDECORE="-lkdecore" LIB_TDECORE="-ltdecore"
LIB_KDEUI="-lkdeui" LIB_TDEUI="-ltdeui"
LIB_KIO="-lkio" LIB_TDEIO="-ltdeio"
LIB_KJS="-lkjs" LIB_KJS="-lkjs"
@ -32846,66 +32846,66 @@ if test $kde_qtver = 3; then
LIB_KAB="-lkab" LIB_KAB="-lkab"
LIB_KABC="-lkabc" LIB_KABC="-ltdeabc"
LIB_KHTML="-lkhtml" LIB_TDEHTML="-ltdehtml"
LIB_KSPELL="-lkspell" LIB_TDESPELL="-ltdespell"
LIB_KPARTS="-lkparts" LIB_TDEPARTS="-ltdeparts"
LIB_KDEPRINT="-lkdeprint" LIB_TDEPRINT="-ltdeprint"
LIB_KUTILS="-lkutils" LIB_TDEUTILS="-ltdeutils"
LIB_KDEPIM="-lkdepim" LIB_TDEPIM="-ltdepim"
LIB_KIMPROXY="-lkimproxy" LIB_TDEIMPROXY="-ltdeimproxy"
LIB_KNEWSTUFF="-lknewstuff" LIB_KNEWSTUFF="-lknewstuff"
LIB_KDNSSD="-lkdnssd" LIB_TDEDNSSD="-ltdednssd"
LIB_KUNITTEST="-lkunittest" LIB_TDEUNITTEST="-ltdeunittest"
# 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
@ -33721,7 +33721,7 @@ Usage: $0 [OPTIONS] [FILE]...
-h, --help print this help, then exit -h, --help print this help, then exit
-V, --version print version number and configuration settings, then exit -V, --version print version number and configuration settings, then exit
-q, --quiet do not print progress messages -q, --tquiet do not print progress messages
-d, --debug don't remove temporary files -d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions --recheck update $as_me by reconfiguring in the same conditions
--file=FILE[:TEMPLATE] --file=FILE[:TEMPLATE]
@ -33798,7 +33798,7 @@ Try \`$0 --help' for more information." >&2
{ (exit 1); exit 1; }; };; { (exit 1); exit 1; }; };;
--help | --hel | -h ) --help | --hel | -h )
echo "$ac_cs_usage"; exit ;; echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \ -q | -tquiet | --tquiet | --tquie | --tqui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil | --si | --s) | -silent | --silent | --silen | --sile | --sil | --si | --s)
ac_cs_silent=: ;; ac_cs_silent=: ;;
@ -34225,28 +34225,28 @@ kde_templatesdir!$kde_templatesdir$ac_delim
kde_servicesdir!$kde_servicesdir$ac_delim kde_servicesdir!$kde_servicesdir$ac_delim
kde_servicetypesdir!$kde_servicetypesdir$ac_delim kde_servicetypesdir!$kde_servicetypesdir$ac_delim
kde_moduledir!$kde_moduledir$ac_delim kde_moduledir!$kde_moduledir$ac_delim
kdeinitdir!$kdeinitdir$ac_delim tdeinitdir!$tdeinitdir$ac_delim
kde_styledir!$kde_styledir$ac_delim kde_styledir!$kde_styledir$ac_delim
kde_widgetdir!$kde_widgetdir$ac_delim kde_widgetdir!$kde_widgetdir$ac_delim
LIB_KDED!$LIB_KDED$ac_delim LIB_KDED!$LIB_KDED$ac_delim
LIB_KDECORE!$LIB_KDECORE$ac_delim LIB_TDECORE!$LIB_TDECORE$ac_delim
LIB_KDEUI!$LIB_KDEUI$ac_delim LIB_TDEUI!$LIB_TDEUI$ac_delim
LIB_KIO!$LIB_KIO$ac_delim LIB_TDEIO!$LIB_TDEIO$ac_delim
LIB_KJS!$LIB_KJS$ac_delim LIB_KJS!$LIB_KJS$ac_delim
LIB_SMB!$LIB_SMB$ac_delim LIB_SMB!$LIB_SMB$ac_delim
LIB_KAB!$LIB_KAB$ac_delim LIB_KAB!$LIB_KAB$ac_delim
LIB_KABC!$LIB_KABC$ac_delim LIB_KABC!$LIB_KABC$ac_delim
LIB_KHTML!$LIB_KHTML$ac_delim LIB_TDEHTML!$LIB_TDEHTML$ac_delim
LIB_KSPELL!$LIB_KSPELL$ac_delim LIB_TDESPELL!$LIB_TDESPELL$ac_delim
LIB_KPARTS!$LIB_KPARTS$ac_delim LIB_TDEPARTS!$LIB_TDEPARTS$ac_delim
LIB_KDEPRINT!$LIB_KDEPRINT$ac_delim LIB_TDEPRINT!$LIB_TDEPRINT$ac_delim
LIB_KUTILS!$LIB_KUTILS$ac_delim LIB_TDEUTILS!$LIB_TDEUTILS$ac_delim
LIB_KDEPIM!$LIB_KDEPIM$ac_delim LIB_TDEPIM!$LIB_TDEPIM$ac_delim
LIB_KIMPROXY!$LIB_KIMPROXY$ac_delim LIB_TDEIMPROXY!$LIB_TDEIMPROXY$ac_delim
LIB_KNEWSTUFF!$LIB_KNEWSTUFF$ac_delim LIB_KNEWSTUFF!$LIB_KNEWSTUFF$ac_delim
LIB_KDNSSD!$LIB_KDNSSD$ac_delim LIB_TDEDNSSD!$LIB_TDEDNSSD$ac_delim
LIB_KUNITTEST!$LIB_KUNITTEST$ac_delim LIB_TDEUNITTEST!$LIB_TDEUNITTEST$ac_delim
LIB_KSYCOCA!$LIB_KSYCOCA$ac_delim LIB_TDESYCOCA!$LIB_TDESYCOCA$ac_delim
LIB_KFILE!$LIB_KFILE$ac_delim LIB_KFILE!$LIB_KFILE$ac_delim
LIB_KFM!$LIB_KFM$ac_delim LIB_KFM!$LIB_KFM$ac_delim
TOPSUBDIRS!$TOPSUBDIRS$ac_delim TOPSUBDIRS!$TOPSUBDIRS$ac_delim
@ -34836,7 +34836,7 @@ if test "$no_create" != yes; then
ac_cs_success=: ac_cs_success=:
ac_config_status_args= ac_config_status_args=
test "$silent" = yes && test "$silent" = yes &&
ac_config_status_args="$ac_config_status_args --quiet" ac_config_status_args="$ac_config_status_args --tquiet"
exec 5>/dev/null exec 5>/dev/null
$SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
exec 5>>config.log exec 5>>config.log
@ -34850,13 +34850,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

@ -731,7 +731,7 @@ PACKAGE_STRING=
PACKAGE_BUGREPORT= PACKAGE_BUGREPORT=
ac_unique_file="acinclude.m4" ac_unique_file="acinclude.m4"
ac_default_prefix=${KDEDIR:-the kde prefix} ac_default_prefix=${TDEDIR:-the kde prefix}
# Factoring default headers for most tests. # Factoring default headers for most tests.
ac_includes_default="\ ac_includes_default="\
#include <stdio.h> #include <stdio.h>
@ -986,28 +986,28 @@ kde_templatesdir
kde_servicesdir kde_servicesdir
kde_servicetypesdir kde_servicetypesdir
kde_moduledir kde_moduledir
kdeinitdir tdeinitdir
kde_styledir kde_styledir
kde_widgetdir kde_widgetdir
LIB_KDED LIB_KDED
LIB_KDECORE LIB_TDECORE
LIB_KDEUI LIB_TDEUI
LIB_KIO LIB_TDEIO
LIB_KJS LIB_KJS
LIB_SMB LIB_SMB
LIB_KAB LIB_KAB
LIB_KABC LIB_KABC
LIB_KHTML LIB_TDEHTML
LIB_KSPELL LIB_TDESPELL
LIB_KPARTS LIB_TDEPARTS
LIB_KDEPRINT LIB_TDEPRINT
LIB_KUTILS LIB_TDEUTILS
LIB_KDEPIM LIB_TDEPIM
LIB_KIMPROXY LIB_TDEIMPROXY
LIB_KNEWSTUFF LIB_KNEWSTUFF
LIB_KDNSSD LIB_TDEDNSSD
LIB_KUNITTEST LIB_TDEUNITTEST
LIB_KSYCOCA LIB_TDESYCOCA
LIB_KFILE LIB_KFILE
LIB_KFM LIB_KFM
TOPSUBDIRS TOPSUBDIRS
@ -1299,7 +1299,7 @@ do
-psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
psdir=$ac_optarg ;; psdir=$ac_optarg ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \ -q | -tquiet | --tquiet | --tquie | --tqui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil) | -silent | --silent | --silen | --sile | --sil)
silent=yes ;; silent=yes ;;
@ -1546,7 +1546,7 @@ Configuration:
--help=short display options specific to this package --help=short display options specific to this package
--help=recursive display the short help of all the included packages --help=recursive display the short help of all the included packages
-V, --version display version information and exit -V, --version display version information and exit
-q, --quiet, --silent do not print \`checking...' messages -q, --tquiet, --silent do not print \`checking...' messages
--cache-file=FILE cache test results in FILE [disabled] --cache-file=FILE cache test results in FILE [disabled]
-C, --config-cache alias for \`--cache-file=config.cache' -C, --config-cache alias for \`--cache-file=config.cache'
-n, --no-create do not create output files -n, --no-create do not create output files
@ -1816,7 +1816,7 @@ do
do do
case $ac_arg in case $ac_arg in
-no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \ -q | -tquiet | --tquiet | --tquie | --tqui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil) | -silent | --silent | --silen | --sile | --sil)
continue ;; continue ;;
*\'*) *\'*)
@ -1832,7 +1832,7 @@ do
case $ac_arg in case $ac_arg in
*=* | --config-cache | -C | -disable-* | --disable-* \ *=* | --config-cache | -C | -disable-* | --disable-* \
| -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
| -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ | -q | -tquiet | --q* | -silent | --sil* | -v | -verb* \
| -with-* | --with-* | -without-* | --without-* | --x) | -with-* | --with-* | -without-* | --without-* | --x)
case "$ac_configure_args0 " in case "$ac_configure_args0 " in
"$ac_configure_args1"*" '$ac_arg' "* ) continue ;; "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
@ -2725,11 +2725,11 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin" kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs" test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
if test -n "$KDEDIRS"; then if test -n "$TDEDIRS"; then
kde_save_IFS=$IFS kde_save_IFS=$IFS
IFS=: IFS=:
for dir in $KDEDIRS; do for dir in $TDEDIRS; do
kde_default_bindirs="$dir/bin $kde_default_bindirs " kde_default_bindirs="$dir/bin $kde_default_bindirs "
done done
IFS=$kde_save_IFS IFS=$kde_save_IFS
@ -2737,12 +2737,12 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
if test "x$prefix" = "xNONE"; then if test "x$prefix" = "xNONE"; then
{ echo "$as_me:$LINENO: checking for kde-config" >&5 { echo "$as_me:$LINENO: checking for tde-config" >&5
echo $ECHO_N "checking for kde-config... $ECHO_C" >&6; } echo $ECHO_N "checking for tde-config... $ECHO_C" >&6; }
if test -n "$KDECONFIG"; then if test -n "$KDECONFIG"; then
kde_cv_path="$KDECONFIG"; kde_cv_path="$KDECONFIG";
else else
kde_cache=`echo kde-config | sed 'y%./+-%__p_%'` kde_cache=`echo tde-config | sed 'y%./+-%__p_%'`
if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
@ -2761,16 +2761,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
@ -2790,10 +2790,10 @@ fi
{ echo "$as_me:$LINENO: result: not found" >&5 { echo "$as_me:$LINENO: result: not found" >&5
echo "${ECHO_T}not found" >&6; } echo "${ECHO_T}not found" >&6; }
{ { echo "$as_me:$LINENO: error: The important program kde-config was not found! { { echo "$as_me:$LINENO: error: The important program tde-config was not found!
Please check whether you installed KDE correctly. Please check whether you installed KDE correctly.
" >&5 " >&5
echo "$as_me: error: The important program kde-config was not found! echo "$as_me: error: The important program tde-config was not found!
Please check whether you installed KDE correctly. Please check whether you installed KDE correctly.
" >&2;} " >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
@ -2809,12 +2809,12 @@ echo "${ECHO_T}$kde_cv_path" >&6; }
kde_save_PATH="$PATH" kde_save_PATH="$PATH"
PATH="$exec_prefix/bin:$prefix/bin:$PATH" PATH="$exec_prefix/bin:$prefix/bin:$PATH"
{ echo "$as_me:$LINENO: checking for kde-config" >&5 { echo "$as_me:$LINENO: checking for tde-config" >&5
echo $ECHO_N "checking for kde-config... $ECHO_C" >&6; } echo $ECHO_N "checking for tde-config... $ECHO_C" >&6; }
if test -n "$KDECONFIG"; then if test -n "$KDECONFIG"; then
kde_cv_path="$KDECONFIG"; kde_cv_path="$KDECONFIG";
else else
kde_cache=`echo kde-config | sed 'y%./+-%__p_%'` kde_cache=`echo tde-config | sed 'y%./+-%__p_%'`
if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
@ -2833,16 +2833,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
@ -2862,10 +2862,10 @@ fi
{ echo "$as_me:$LINENO: result: not found" >&5 { echo "$as_me:$LINENO: result: not found" >&5
echo "${ECHO_T}not found" >&6; } echo "${ECHO_T}not found" >&6; }
{ { echo "$as_me:$LINENO: error: The important program kde-config was not found! { { echo "$as_me:$LINENO: error: The important program tde-config was not found!
Please check whether you installed KDE correctly. Please check whether you installed KDE correctly.
" >&5 " >&5
echo "$as_me: error: The important program kde-config was not found! echo "$as_me: error: The important program tde-config was not found!
Please check whether you installed KDE correctly. Please check whether you installed KDE correctly.
" >&2;} " >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
@ -2882,13 +2882,13 @@ echo "${ECHO_T}$kde_cv_path" >&6; }
kde_libs_prefix=`$KDECONFIG --prefix` kde_libs_prefix=`$KDECONFIG --prefix`
if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
{ { echo "$as_me:$LINENO: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs. { { echo "$as_me:$LINENO: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs.
This means it has been moved since you installed it. This means it has been moved since you installed it.
This won't work. Please recompile kdelibs for the new prefix. This won't work. Please recompile tdelibs for the new prefix.
" >&5 " >&5
echo "$as_me: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs. echo "$as_me: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs.
This means it has been moved since you installed it. This means it has been moved since you installed it.
This won't work. Please recompile kdelibs for the new prefix. This won't work. Please recompile tdelibs for the new prefix.
" >&2;} " >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
@ -2898,8 +2898,8 @@ echo "$as_me: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_
echo $ECHO_N "checking where to install... $ECHO_C" >&6; } echo $ECHO_N "checking where to install... $ECHO_C" >&6; }
if test "x$prefix" = "xNONE"; then if test "x$prefix" = "xNONE"; then
prefix=$kde_libs_prefix prefix=$kde_libs_prefix
{ echo "$as_me:$LINENO: result: $prefix (as returned by kde-config)" >&5 { echo "$as_me:$LINENO: result: $prefix (as returned by tde-config)" >&5
echo "${ECHO_T}$prefix (as returned by kde-config)" >&6; } echo "${ECHO_T}$prefix (as returned by tde-config)" >&6; }
else else
given_prefix=$prefix given_prefix=$prefix
{ echo "$as_me:$LINENO: result: $prefix (as requested)" >&5 { echo "$as_me:$LINENO: result: $prefix (as requested)" >&5
@ -7651,13 +7651,13 @@ fi
# Check whether --enable-libsuffix was given. # Check whether --enable-libsuffix was given.
if test "${enable_libsuffix+set}" = set; then if test "${enable_libsuffix+set}" = set; then
enableval=$enable_libsuffix; kdelibsuff=$enableval enableval=$enable_libsuffix; tdelibsuff=$enableval
else else
kdelibsuff="auto" tdelibsuff="auto"
fi fi
if test "$kdelibsuff" = "auto"; then if test "$tdelibsuff" = "auto"; then
cat > conftest.c << EOF cat > conftest.c << EOF
#include <stdio.h> #include <stdio.h>
@ -7665,17 +7665,17 @@ int main() {
return 0; return 0;
} }
EOF EOF
kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ tdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
s,.*/lib\([^\/]*\)/.*,\1, s,.*/lib\([^\/]*\)/.*,\1,
p p
}'` }'`
rm -rf conftest.* rm -rf conftest.*
fi fi
if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then if test "$tdelibsuff" = "no" || test "$tdelibsuff" = "none"; 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; }
@ -7685,16 +7685,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 was given. # Check whether --enable-fast-install was given.
@ -8882,8 +8882,8 @@ echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
no:yes:* ) no:yes:* )
{ echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing preretquisite headers?" >&5
echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} echo "$as_me: WARNING: $ac_header: check for missing preretquisite headers?" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
@ -9352,7 +9352,7 @@ EOF
ac_status=$? ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s "$nlist"; then (exit $ac_status); } && test -s "$nlist"; then
# Try sorting and uniquifying the output. # Try sorting and unitquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist" mv -f "$nlist"T "$nlist"
else else
@ -22591,7 +22591,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)" KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs. # This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)" KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
@ -23023,7 +23023,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
@ -23234,7 +23234,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
@ -24620,8 +24620,8 @@ echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
no:yes:* ) no:yes:* )
{ echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing preretquisite headers?" >&5
echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} echo "$as_me: WARNING: $ac_header: check for missing preretquisite headers?" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
@ -24762,8 +24762,8 @@ echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
no:yes:* ) no:yes:* )
{ echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing preretquisite headers?" >&5
echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} echo "$as_me: WARNING: $ac_header: check for missing preretquisite headers?" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
@ -24971,8 +24971,8 @@ echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
no:yes:* ) no:yes:* )
{ echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing preretquisite headers?" >&5
echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} echo "$as_me: WARNING: $ac_header: check for missing preretquisite headers?" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
@ -25108,8 +25108,8 @@ echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the compiler's res
no:yes:* ) no:yes:* )
{ echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: present but cannot be compiled" >&5 { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: present but cannot be compiled" >&5
echo "$as_me: WARNING: CoreAudio/CoreAudio.h: present but cannot be compiled" >&2;} echo "$as_me: WARNING: CoreAudio/CoreAudio.h: present but cannot be compiled" >&2;}
{ echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: check for missing prerequisite headers?" >&5 { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: check for missing preretquisite headers?" >&5
echo "$as_me: WARNING: CoreAudio/CoreAudio.h: check for missing prerequisite headers?" >&2;} echo "$as_me: WARNING: CoreAudio/CoreAudio.h: check for missing preretquisite headers?" >&2;}
{ echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: see the Autoconf documentation" >&5 { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: see the Autoconf documentation" >&5
echo "$as_me: WARNING: CoreAudio/CoreAudio.h: see the Autoconf documentation" >&2;} echo "$as_me: WARNING: CoreAudio/CoreAudio.h: see the Autoconf documentation" >&2;}
{ echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: section \"Present But Cannot Be Compiled\"" >&5 { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: section \"Present But Cannot Be Compiled\"" >&5
@ -25313,7 +25313,7 @@ if test "x$kde_cv_func_res_init" = xyes; then
else else
case "res_init" in case "res_init" in
setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat) setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
kde_cv_proto_res_init="yes - in libkdefakes" kde_cv_proto_res_init="yes - in libtdefakes"
;; ;;
*) *)
kde_cv_proto_res_init=unknown kde_cv_proto_res_init=unknown
@ -28418,8 +28418,8 @@ echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
no:yes:* ) no:yes:* )
{ echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing preretquisite headers?" >&5
echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} echo "$as_me: WARNING: $ac_header: check for missing preretquisite headers?" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
@ -28853,41 +28853,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
@ -28952,7 +28952,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
@ -30303,7 +30303,7 @@ qt_includes=""
# Check whether --with-qt-dir was given. # Check whether --with-qt-dir was given.
if test "${with_qt_dir+set}" = set; then if test "${with_qt_dir+set}" = set; then
withval=$with_qt_dir; ac_qt_includes="$withval"/include withval=$with_qt_dir; 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
@ -30368,7 +30368,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
@ -31169,16 +31169,16 @@ else
if test "$kde_qtver" = 1; then if test "$kde_qtver" = 1; then
kde_check_header="ksock.h" kde_check_header="ksock.h"
kde_check_lib="libkdecore.la" kde_check_lib="libtdecore.la"
else else
kde_check_header="ksharedptr.h" kde_check_header="ksharedptr.h"
kde_check_lib="libkio.la" kde_check_lib="libtdeio.la"
fi fi
if test -z ""; then if test -z ""; then
kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs" test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs"
kde_incdirs="$ac_kde_includes $kde_incdirs" kde_incdirs="$ac_kde_includes $kde_incdirs"
kde_incdir=NO kde_incdir=NO
@ -31207,8 +31207,8 @@ So, check this please and use another prefix!" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}"
test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs" test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs"
kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
kde_libdir=NO kde_libdir=NO
@ -31257,10 +31257,10 @@ 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/kdewidgets.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
@ -31394,20 +31394,20 @@ fi
echo "${ECHO_T}$kde_cv_uic_plugins" >&6; } echo "${ECHO_T}$kde_cv_uic_plugins" >&6; }
if test "$kde_cv_uic_plugins" != yes; then if test "$kde_cv_uic_plugins" != yes; then
{ { echo "$as_me:$LINENO: error: { { echo "$as_me:$LINENO: error:
you need to install kdelibs first. you need to install tdelibs first.
If you did install kdelibs, then the Qt version that is picked up by If you did install tdelibs, then the Qt version that is picked up by
this configure is not the same version you used to compile kdelibs. this configure is not the same version you used to compile tdelibs.
The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the
_same Qt version_, compiled with the _same compiler_ and the same Qt _same Qt version_, compiled with the _same compiler_ and the same Qt
configuration settings. configuration settings.
" >&5 " >&5
echo "$as_me: error: echo "$as_me: error:
you need to install kdelibs first. you need to install tdelibs first.
If you did install kdelibs, then the Qt version that is picked up by If you did install tdelibs, then the Qt version that is picked up by
this configure is not the same version you used to compile kdelibs. this configure is not the same version you used to compile tdelibs.
The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the
_same Qt version_, compiled with the _same compiler_ and the same Qt _same Qt version_, compiled with the _same compiler_ and the same Qt
configuration settings. configuration settings.
" >&2;} " >&2;}
@ -31582,20 +31582,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");
@ -31658,7 +31658,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
@ -31670,22 +31670,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
@ -31884,20 +31884,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");
@ -31960,7 +31960,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
@ -31972,22 +31972,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
@ -32096,11 +32096,11 @@ _ACEOF
kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin" kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs" test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
if test -n "$KDEDIRS"; then if test -n "$TDEDIRS"; then
kde_save_IFS=$IFS kde_save_IFS=$IFS
IFS=: IFS=:
for dir in $KDEDIRS; do for dir in $TDEDIRS; do
kde_default_bindirs="$dir/bin $kde_default_bindirs " kde_default_bindirs="$dir/bin $kde_default_bindirs "
done done
IFS=$kde_save_IFS IFS=$kde_save_IFS
@ -32474,12 +32474,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 { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
@ -32498,16 +32498,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
@ -32527,10 +32527,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; }; }
@ -32614,12 +32614,12 @@ echo "${ECHO_T}$kde_cv_path" >&6; }
fi fi
if test -n "$kde33ornewer"; then if test -n "$kde33ornewer"; then
{ echo "$as_me:$LINENO: checking for makekdewidgets" >&5 { echo "$as_me:$LINENO: checking for maketdewidgets" >&5
echo $ECHO_N "checking for makekdewidgets... $ECHO_C" >&6; } echo $ECHO_N "checking for maketdewidgets... $ECHO_C" >&6; }
if test -n "$MAKEKDEWIDGETS"; then if test -n "$MAKEKDEWIDGETS"; then
kde_cv_path="$MAKEKDEWIDGETS"; kde_cv_path="$MAKEKDEWIDGETS";
else else
kde_cache=`echo makekdewidgets | sed 'y%./+-%__p_%'` kde_cache=`echo maketdewidgets | sed 'y%./+-%__p_%'`
if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
@ -32638,16 +32638,16 @@ else
IFS=$kde_save_IFS IFS=$kde_save_IFS
for dir in $dirs; do for dir in $dirs; do
if test -x "$dir/makekdewidgets"; then if test -x "$dir/maketdewidgets"; then
if test -n "" if test -n ""
then then
evalstr="$dir/makekdewidgets 2>&1 " evalstr="$dir/maketdewidgets 2>&1 "
if eval $evalstr; then if eval $evalstr; then
kde_cv_path="$dir/makekdewidgets" kde_cv_path="$dir/maketdewidgets"
break break
fi fi
else else
kde_cv_path="$dir/makekdewidgets" kde_cv_path="$dir/maketdewidgets"
break break
fi fi
fi fi
@ -32667,10 +32667,10 @@ fi
{ echo "$as_me:$LINENO: result: not found" >&5 { echo "$as_me:$LINENO: result: not found" >&5
echo "${ECHO_T}not found" >&6; } echo "${ECHO_T}not found" >&6; }
{ { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found! { { echo "$as_me:$LINENO: error: The important program maketdewidgets was not found!
Please check whether you installed KDE correctly. Please check whether you installed KDE correctly.
" >&5 " >&5
echo "$as_me: error: The important program makekdewidgets was not found! echo "$as_me: error: The important program maketdewidgets was not found!
Please check whether you installed KDE correctly. Please check whether you installed KDE correctly.
" >&2;} " >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
@ -32748,7 +32748,7 @@ echo "${ECHO_T}$kde_cv_path" >&6; }
if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then if test -n "$MEINPROC" -a "$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;
@ -32810,7 +32810,7 @@ done
kdeinitdir='$(kde_moduledir)' tdeinitdir='$(kde_moduledir)'
@ -32829,16 +32829,16 @@ fi
if test $kde_qtver = 3; then if test $kde_qtver = 3; then
case $host in case $host in
*cygwin*) lib_kded="-lkdeinit_kded" ;; *cygwin*) lib_kded="-ltdeinit_kded" ;;
*) lib_kded="" ;; *) lib_kded="" ;;
esac esac
LIB_KDED=$lib_kded LIB_KDED=$lib_kded
LIB_KDECORE="-lkdecore" LIB_TDECORE="-ltdecore"
LIB_KDEUI="-lkdeui" LIB_TDEUI="-ltdeui"
LIB_KIO="-lkio" LIB_TDEIO="-ltdeio"
LIB_KJS="-lkjs" LIB_KJS="-lkjs"
@ -32846,66 +32846,66 @@ if test $kde_qtver = 3; then
LIB_KAB="-lkab" LIB_KAB="-lkab"
LIB_KABC="-lkabc" LIB_KABC="-ltdeabc"
LIB_KHTML="-lkhtml" LIB_TDEHTML="-ltdehtml"
LIB_KSPELL="-lkspell" LIB_TDESPELL="-ltdespell"
LIB_KPARTS="-lkparts" LIB_TDEPARTS="-ltdeparts"
LIB_KDEPRINT="-lkdeprint" LIB_TDEPRINT="-ltdeprint"
LIB_KUTILS="-lkutils" LIB_TDEUTILS="-ltdeutils"
LIB_KDEPIM="-lkdepim" LIB_TDEPIM="-ltdepim"
LIB_KIMPROXY="-lkimproxy" LIB_TDEIMPROXY="-ltdeimproxy"
LIB_KNEWSTUFF="-lknewstuff" LIB_KNEWSTUFF="-lknewstuff"
LIB_KDNSSD="-lkdnssd" LIB_TDEDNSSD="-ltdednssd"
LIB_KUNITTEST="-lkunittest" LIB_TDEUNITTEST="-ltdeunittest"
# 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
@ -33721,7 +33721,7 @@ Usage: $0 [OPTIONS] [FILE]...
-h, --help print this help, then exit -h, --help print this help, then exit
-V, --version print version number and configuration settings, then exit -V, --version print version number and configuration settings, then exit
-q, --quiet do not print progress messages -q, --tquiet do not print progress messages
-d, --debug don't remove temporary files -d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions --recheck update $as_me by reconfiguring in the same conditions
--file=FILE[:TEMPLATE] --file=FILE[:TEMPLATE]
@ -33798,7 +33798,7 @@ Try \`$0 --help' for more information." >&2
{ (exit 1); exit 1; }; };; { (exit 1); exit 1; }; };;
--help | --hel | -h ) --help | --hel | -h )
echo "$ac_cs_usage"; exit ;; echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \ -q | -tquiet | --tquiet | --tquie | --tqui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil | --si | --s) | -silent | --silent | --silen | --sile | --sil | --si | --s)
ac_cs_silent=: ;; ac_cs_silent=: ;;
@ -34225,28 +34225,28 @@ kde_templatesdir!$kde_templatesdir$ac_delim
kde_servicesdir!$kde_servicesdir$ac_delim kde_servicesdir!$kde_servicesdir$ac_delim
kde_servicetypesdir!$kde_servicetypesdir$ac_delim kde_servicetypesdir!$kde_servicetypesdir$ac_delim
kde_moduledir!$kde_moduledir$ac_delim kde_moduledir!$kde_moduledir$ac_delim
kdeinitdir!$kdeinitdir$ac_delim tdeinitdir!$tdeinitdir$ac_delim
kde_styledir!$kde_styledir$ac_delim kde_styledir!$kde_styledir$ac_delim
kde_widgetdir!$kde_widgetdir$ac_delim kde_widgetdir!$kde_widgetdir$ac_delim
LIB_KDED!$LIB_KDED$ac_delim LIB_KDED!$LIB_KDED$ac_delim
LIB_KDECORE!$LIB_KDECORE$ac_delim LIB_TDECORE!$LIB_TDECORE$ac_delim
LIB_KDEUI!$LIB_KDEUI$ac_delim LIB_TDEUI!$LIB_TDEUI$ac_delim
LIB_KIO!$LIB_KIO$ac_delim LIB_TDEIO!$LIB_TDEIO$ac_delim
LIB_KJS!$LIB_KJS$ac_delim LIB_KJS!$LIB_KJS$ac_delim
LIB_SMB!$LIB_SMB$ac_delim LIB_SMB!$LIB_SMB$ac_delim
LIB_KAB!$LIB_KAB$ac_delim LIB_KAB!$LIB_KAB$ac_delim
LIB_KABC!$LIB_KABC$ac_delim LIB_KABC!$LIB_KABC$ac_delim
LIB_KHTML!$LIB_KHTML$ac_delim LIB_TDEHTML!$LIB_TDEHTML$ac_delim
LIB_KSPELL!$LIB_KSPELL$ac_delim LIB_TDESPELL!$LIB_TDESPELL$ac_delim
LIB_KPARTS!$LIB_KPARTS$ac_delim LIB_TDEPARTS!$LIB_TDEPARTS$ac_delim
LIB_KDEPRINT!$LIB_KDEPRINT$ac_delim LIB_TDEPRINT!$LIB_TDEPRINT$ac_delim
LIB_KUTILS!$LIB_KUTILS$ac_delim LIB_TDEUTILS!$LIB_TDEUTILS$ac_delim
LIB_KDEPIM!$LIB_KDEPIM$ac_delim LIB_TDEPIM!$LIB_TDEPIM$ac_delim
LIB_KIMPROXY!$LIB_KIMPROXY$ac_delim LIB_TDEIMPROXY!$LIB_TDEIMPROXY$ac_delim
LIB_KNEWSTUFF!$LIB_KNEWSTUFF$ac_delim LIB_KNEWSTUFF!$LIB_KNEWSTUFF$ac_delim
LIB_KDNSSD!$LIB_KDNSSD$ac_delim LIB_TDEDNSSD!$LIB_TDEDNSSD$ac_delim
LIB_KUNITTEST!$LIB_KUNITTEST$ac_delim LIB_TDEUNITTEST!$LIB_TDEUNITTEST$ac_delim
LIB_KSYCOCA!$LIB_KSYCOCA$ac_delim LIB_TDESYCOCA!$LIB_TDESYCOCA$ac_delim
LIB_KFILE!$LIB_KFILE$ac_delim LIB_KFILE!$LIB_KFILE$ac_delim
LIB_KFM!$LIB_KFM$ac_delim LIB_KFM!$LIB_KFM$ac_delim
TOPSUBDIRS!$TOPSUBDIRS$ac_delim TOPSUBDIRS!$TOPSUBDIRS$ac_delim
@ -34836,7 +34836,7 @@ if test "$no_create" != yes; then
ac_cs_success=: ac_cs_success=:
ac_config_status_args= ac_config_status_args=
test "$silent" = yes && test "$silent" = yes &&
ac_config_status_args="$ac_config_status_args --quiet" ac_config_status_args="$ac_config_status_args --tquiet"
exec 5>/dev/null exec 5>/dev/null
$SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
exec 5>>config.log exec 5>>config.log
@ -34850,13 +34850,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

@ -647,41 +647,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!
@ -881,24 +881,24 @@ m4trace:acinclude.m4:396: -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)
@ -1045,11 +1045,11 @@ Please check whether you installed aRts correctly or use
]) ])
m4trace:acinclude.m4:559: -1- AC_DEFUN([KDE_SET_DEFAULT_BINDIRS], [ m4trace:acinclude.m4:559: -1- AC_DEFUN([KDE_SET_DEFAULT_BINDIRS], [
kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin" kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs" test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
if test -n "$KDEDIRS"; then if test -n "$TDEDIRS"; then
kde_save_IFS=$IFS kde_save_IFS=$IFS
IFS=: IFS=:
for dir in $KDEDIRS; do for dir in $TDEDIRS; do
kde_default_bindirs="$dir/bin $kde_default_bindirs " kde_default_bindirs="$dir/bin $kde_default_bindirs "
done done
IFS=$kde_save_IFS IFS=$kde_save_IFS
@ -1098,18 +1098,18 @@ m4trace:acinclude.m4:641: -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
if test -n "$kde33ornewer"; then if test -n "$kde33ornewer"; then
KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)]) KDE_FIND_PATH(maketdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(maketdewidgets)])
AC_SUBST(MAKEKDEWIDGETS) AC_SUBST(MAKEKDEWIDGETS)
fi fi
KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""]) KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then if test -n "$MEINPROC" -a "$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=""
@ -1202,7 +1202,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
@ -1420,7 +1420,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
@ -1794,7 +1794,7 @@ AC_ARG_ENABLE(
USING_QT_MT="" USING_QT_MT=""
dnl ------------------------------------------------------------------------ dnl ------------------------------------------------------------------------
dnl If we not get --disable-qt-mt then adjust some vars for the host. dnl If we not get --disable-tqt-mt then adjust some vars for the host.
dnl ------------------------------------------------------------------------ dnl ------------------------------------------------------------------------
KDE_MT_LDFLAGS= KDE_MT_LDFLAGS=
@ -1852,7 +1852,7 @@ dnl ------------------------------------------------------------
fi fi
dnl ------------------------------------------------------------------------ dnl ------------------------------------------------------------------------
dnl If we got --enable-qt-mt then adjust the Qt library name for the host. dnl If we got --enable-tqt-mt then adjust the Qt library name for the host.
dnl ------------------------------------------------------------------------ dnl ------------------------------------------------------------------------
if test "x$kde_use_qt_mt" = "xyes"; then if test "x$kde_use_qt_mt" = "xyes"; then
@ -1887,7 +1887,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
]) ])
@ -1928,7 +1928,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
@ -2109,11 +2109,11 @@ rm -f actest.ui actest.cpp
AC_MSG_RESULT([$kde_cv_uic_plugins]) AC_MSG_RESULT([$kde_cv_uic_plugins])
if test "$kde_cv_uic_plugins" != yes; then if test "$kde_cv_uic_plugins" != yes; then
AC_MSG_ERROR([ AC_MSG_ERROR([
you need to install kdelibs first. you need to install tdelibs first.
If you did install kdelibs, then the Qt version that is picked up by If you did install tdelibs, then the Qt version that is picked up by
this configure is not the same version you used to compile kdelibs. this configure is not the same version you used to compile tdelibs.
The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the
_same Qt version_, compiled with the _same compiler_ and the same Qt _same Qt version_, compiled with the _same compiler_ and the same Qt
configuration settings. configuration settings.
]) ])
@ -2232,16 +2232,16 @@ AC_CACHE_VAL(ac_cv_have_kde,
if test "$kde_qtver" = 1; then if test "$kde_qtver" = 1; then
kde_check_header="ksock.h" kde_check_header="ksock.h"
kde_check_lib="libkdecore.la" kde_check_lib="libtdecore.la"
else else
kde_check_header="ksharedptr.h" kde_check_header="ksharedptr.h"
kde_check_lib="libkio.la" kde_check_lib="libtdeio.la"
fi fi
if test -z "$1"; then if test -z "$1"; then
kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs" test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs"
kde_incdirs="$ac_kde_includes $kde_incdirs" kde_incdirs="$ac_kde_includes $kde_incdirs"
AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir) AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
ac_kde_includes="$kde_incdir" ac_kde_includes="$kde_incdir"
@ -2252,8 +2252,8 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail.
So, check this please and use another prefix!]) So, check this please and use another prefix!])
fi fi
kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}"
test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs" test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs"
kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir) AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
ac_kde_libraries="$kde_libdir" ac_kde_libraries="$kde_libdir"
@ -2271,7 +2271,7 @@ 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/kdewidgets.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
@ -2286,7 +2286,7 @@ else
ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries" ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
fi fi
else dnl test -z $1, e.g. from kdelibs else dnl test -z $1, e.g. from tdelibs
ac_cv_have_kde="have_kde=no" ac_cv_have_kde="have_kde=no"
@ -2422,20 +2422,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");
@ -2471,7 +2471,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([
@ -2503,48 +2503,48 @@ m4trace:acinclude.m4:2110: -1- AC_DEFUN([KDE_CREATE_LIBS_ALIASES], [
if test $kde_qtver = 3; then if test $kde_qtver = 3; then
case $host in case $host in
*cygwin*) lib_kded="-lkdeinit_kded" ;; *cygwin*) lib_kded="-ltdeinit_kded" ;;
*) lib_kded="" ;; *) lib_kded="" ;;
esac esac
AC_SUBST(LIB_KDED, $lib_kded) AC_SUBST(LIB_KDED, $lib_kded)
AC_SUBST(LIB_KDECORE, "-lkdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_KDEUI, "-lkdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lkabc") AC_SUBST(LIB_KABC, "-ltdeabc")
AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_KDEPRINT, "-lkdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-lkutils") AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
AC_SUBST(LIB_KDEPIM, "-lkdepim") AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-lkimproxy") AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-lkdnssd") AC_SUBST(LIB_TDEDNSSD, "-ltdednssd")
AC_SUBST(LIB_KUNITTEST, "-lkunittest") AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest")
# 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:2134: -1- AC_DEFUN([AC_PATH_KDE], [ m4trace:acinclude.m4:2134: -1- AC_DEFUN([AC_PATH_KDE], [
@ -2604,7 +2604,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
@ -2888,7 +2888,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:2530: -1- AC_DEFUN([KDE_FIND_JPEG_HELPER], [ m4trace:acinclude.m4:2530: -1- AC_DEFUN([KDE_FIND_JPEG_HELPER], [
@ -2942,7 +2942,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
@ -3832,7 +3832,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)" KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
AC_SUBST(KDE_PLUGIN) AC_SUBST(KDE_PLUGIN)
# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs. # This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)" KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
AC_SUBST(KDE_CHECK_PLUGIN) AC_SUBST(KDE_CHECK_PLUGIN)
@ -3843,9 +3843,9 @@ m4trace:acinclude.m4:3536: -1- AC_DEFUN([KDE_CHECK_LIB64], [
AC_ARG_ENABLE(libsuffix, AC_ARG_ENABLE(libsuffix,
AC_HELP_STRING([--enable-libsuffix], AC_HELP_STRING([--enable-libsuffix],
[/lib directory suffix (64,32,none,auto[=default])]), [/lib directory suffix (64,32,none,auto[=default])]),
kdelibsuff=$enableval, kdelibsuff="auto") tdelibsuff=$enableval, tdelibsuff="auto")
if test "$kdelibsuff" = "auto"; then if test "$tdelibsuff" = "auto"; then
cat > conftest.c << EOF cat > conftest.c << EOF
#include <stdio.h> #include <stdio.h>
@ -3853,26 +3853,26 @@ int main() {
return 0; return 0;
} }
EOF EOF
kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ tdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
s,.*/lib\([[^\/]]*\)/.*,\1, s,.*/lib\([[^\/]]*\)/.*,\1,
p p
}'` }'`
rm -rf conftest.* rm -rf conftest.*
fi fi
if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then if test "$tdelibsuff" = "no" || test "$tdelibsuff" = "none"; 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:3543: -1- AC_DEFUN([KDE_CHECK_TYPES], [ AC_CHECK_SIZEOF(int, 4)dnl m4trace:acinclude.m4:3543: -1- AC_DEFUN([KDE_CHECK_TYPES], [ AC_CHECK_SIZEOF(int, 4)dnl
@ -3885,7 +3885,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
@ -4798,7 +4798,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)
@ -5152,8 +5152,8 @@ m4trace:acinclude.m4:4947: -1- AC_DEFUN([KDE_CONF_FILES], [
]) ])
m4trace:acinclude.m4:4972: -1- AC_DEFUN([KDE_SET_PREFIX_CORE], [ m4trace:acinclude.m4:4972: -1- AC_DEFUN([KDE_SET_PREFIX_CORE], [
unset CDPATH unset CDPATH
dnl make $KDEDIR the default for the installation dnl make $TDEDIR the default for the installation
AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
if test "x$prefix" = "xNONE"; then if test "x$prefix" = "xNONE"; then
prefix=$ac_default_prefix prefix=$ac_default_prefix
@ -5174,25 +5174,25 @@ m4trace:acinclude.m4:5024: -1- AC_DEFUN([KDE_SET_PREFIX], [
unset CDPATH unset CDPATH
dnl We can't give real code to that macro, only a value. dnl We can't give real code to that macro, only a value.
dnl It only matters for --help, since we set the prefix in this function anyway. dnl It only matters for --help, since we set the prefix in this function anyway.
AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix}) AC_PREFIX_DEFAULT(${TDEDIR:-the kde prefix})
KDE_SET_DEFAULT_BINDIRS KDE_SET_DEFAULT_BINDIRS
if test "x$prefix" = "xNONE"; then if test "x$prefix" = "xNONE"; then
dnl no prefix given: look for kde-config in the PATH and deduce the prefix from it dnl no prefix given: look for tde-config in the PATH and deduce the prefix from it
KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend) KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend)
else else
dnl prefix given: look for kde-config, preferrably in prefix, otherwise in PATH dnl prefix given: look for tde-config, preferrably in prefix, otherwise in PATH
kde_save_PATH="$PATH" kde_save_PATH="$PATH"
PATH="$exec_prefix/bin:$prefix/bin:$PATH" PATH="$exec_prefix/bin:$prefix/bin:$PATH"
KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend) KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend)
PATH="$kde_save_PATH" PATH="$kde_save_PATH"
fi fi
kde_libs_prefix=`$KDECONFIG --prefix` kde_libs_prefix=`$KDECONFIG --prefix`
if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs. AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs.
This means it has been moved since you installed it. This means it has been moved since you installed it.
This won't work. Please recompile kdelibs for the new prefix. This won't work. Please recompile tdelibs for the new prefix.
]) ])
fi fi
kde_libs_htmldir=`$KDECONFIG --install html --expandvars` kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
@ -5200,7 +5200,7 @@ m4trace:acinclude.m4:5024: -1- AC_DEFUN([KDE_SET_PREFIX], [
AC_MSG_CHECKING([where to install]) AC_MSG_CHECKING([where to install])
if test "x$prefix" = "xNONE"; then if test "x$prefix" = "xNONE"; then
prefix=$kde_libs_prefix prefix=$kde_libs_prefix
AC_MSG_RESULT([$prefix (as returned by kde-config)]) AC_MSG_RESULT([$prefix (as returned by tde-config)])
else else
dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different
given_prefix=$prefix given_prefix=$prefix
@ -5741,7 +5741,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
@ -5761,7 +5761,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
@ -5982,9 +5982,9 @@ fi
]) ])
m4trace:acinclude.m4:5926: -1- AC_DEFUN([KDE_PKG_CHECK_MODULES], [ m4trace:acinclude.m4:5926: -1- AC_DEFUN([KDE_PKG_CHECK_MODULES], [
PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" PKG_CONFIG_PATH="$prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
if test "$prefix" != "$kde_libs_prefix"; then if test "$prefix" != "$kde_libs_prefix"; then
PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" PKG_CONFIG_PATH="$kde_libs_prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
fi fi
export PKG_CONFIG_PATH export PKG_CONFIG_PATH
PKG_CHECK_MODULES([$1],[$2],[$3],[$4]) PKG_CHECK_MODULES([$1],[$2],[$3],[$4])
@ -10033,7 +10033,7 @@ EOF
# Now try to grab the symbols. # Now try to grab the symbols.
nlist=conftest.nm nlist=conftest.nm
if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
# Try sorting and uniquifying the output. # Try sorting and unitquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist" mv -f "$nlist"T "$nlist"
else else
@ -11592,10 +11592,10 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
m4trace:configure.in:43: -2- _AM_MANGLE_OPTION([no-dependencies]) m4trace:configure.in:43: -2- _AM_MANGLE_OPTION([no-dependencies])
m4trace:configure.in:45: -1- KDE_SET_PREFIX m4trace:configure.in:45: -1- KDE_SET_PREFIX
m4trace:configure.in:45: -1- KDE_SET_DEFAULT_BINDIRS m4trace:configure.in:45: -1- KDE_SET_DEFAULT_BINDIRS
m4trace:configure.in:45: -1- KDE_FIND_PATH([kde-config], [KDECONFIG], [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], [prepend]) m4trace:configure.in:45: -1- KDE_FIND_PATH([tde-config], [KDECONFIG], [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], [prepend])
m4trace:configure.in:45: -1- KDE_MISSING_PROG_ERROR([kde-config]) m4trace:configure.in:45: -1- KDE_MISSING_PROG_ERROR([tde-config])
m4trace:configure.in:45: -1- KDE_FIND_PATH([kde-config], [KDECONFIG], [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], [prepend]) m4trace:configure.in:45: -1- KDE_FIND_PATH([tde-config], [KDECONFIG], [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], [prepend])
m4trace:configure.in:45: -1- KDE_MISSING_PROG_ERROR([kde-config]) m4trace:configure.in:45: -1- KDE_MISSING_PROG_ERROR([tde-config])
m4trace:configure.in:45: -1- m4_pattern_allow([^KDECONFIG$]) m4trace:configure.in:45: -1- m4_pattern_allow([^KDECONFIG$])
m4trace:configure.in:45: -1- m4_pattern_allow([^kde_libs_prefix$]) m4trace:configure.in:45: -1- m4_pattern_allow([^kde_libs_prefix$])
m4trace:configure.in:45: -1- m4_pattern_allow([^kde_libs_htmldir$]) m4trace:configure.in:45: -1- m4_pattern_allow([^kde_libs_htmldir$])
@ -16519,12 +16519,12 @@ 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([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([makekdewidgets], [MAKEKDEWIDGETS], [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)]) m4trace:configure.in:61: -1- KDE_FIND_PATH([maketdewidgets], [MAKEKDEWIDGETS], [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(maketdewidgets)])
m4trace:configure.in:61: -1- KDE_MISSING_PROG_ERROR([makekdewidgets]) m4trace:configure.in:61: -1- KDE_MISSING_PROG_ERROR([maketdewidgets])
m4trace:configure.in:61: -1- m4_pattern_allow([^MAKEKDEWIDGETS$]) m4trace:configure.in:61: -1- m4_pattern_allow([^MAKEKDEWIDGETS$])
m4trace:configure.in:61: -1- KDE_FIND_PATH([xmllint], [XMLLINT], [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""]) m4trace:configure.in:61: -1- KDE_FIND_PATH([xmllint], [XMLLINT], [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
m4trace:configure.in:61: -1- AC_FIND_FILE([apps/ksgmltools2/customization/kde-chunk.xsl], [$kde_sharedirs], [KDE_XSL_STYLESHEET]) m4trace:configure.in:61: -1- AC_FIND_FILE([apps/ksgmltools2/customization/kde-chunk.xsl], [$kde_sharedirs], [KDE_XSL_STYLESHEET])
@ -16572,43 +16572,43 @@ m4trace:configure.in:61: -1- m4_pattern_allow([^kde_templatesdir$])
m4trace:configure.in:61: -1- m4_pattern_allow([^kde_servicesdir$]) m4trace:configure.in:61: -1- m4_pattern_allow([^kde_servicesdir$])
m4trace:configure.in:61: -1- m4_pattern_allow([^kde_servicetypesdir$]) m4trace:configure.in:61: -1- m4_pattern_allow([^kde_servicetypesdir$])
m4trace:configure.in:61: -1- m4_pattern_allow([^kde_moduledir$]) m4trace:configure.in:61: -1- m4_pattern_allow([^kde_moduledir$])
m4trace:configure.in:61: -1- m4_pattern_allow([^kdeinitdir$]) m4trace:configure.in:61: -1- m4_pattern_allow([^tdeinitdir$])
m4trace:configure.in:61: -1- m4_pattern_allow([^kde_styledir$]) m4trace:configure.in:61: -1- m4_pattern_allow([^kde_styledir$])
m4trace:configure.in:61: -1- m4_pattern_allow([^kde_widgetdir$]) m4trace:configure.in:61: -1- m4_pattern_allow([^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- m4_pattern_allow([^LIB_KDED$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDED$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDECORE$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDECORE$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDEUI$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEUI$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KIO$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEIO$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KJS$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KJS$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_SMB$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_SMB$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KAB$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KAB$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KABC$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KABC$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KHTML$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEHTML$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KSPELL$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDESPELL$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KPARTS$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEPARTS$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDEPRINT$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEPRINT$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KUTILS$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEUTILS$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDEPIM$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEPIM$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KIMPROXY$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEIMPROXY$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KNEWSTUFF$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KNEWSTUFF$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDNSSD$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEDNSSD$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KUNITTEST$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEUNITTEST$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KSYCOCA$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDESYCOCA$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KFILE$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KFILE$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDECORE$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDECORE$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDEUI$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEUI$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KIO$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEIO$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KSYCOCA$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDESYCOCA$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_SMB$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_SMB$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KFILE$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KFILE$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KAB$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KAB$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KHTML$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEHTML$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KSPELL$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDESPELL$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KPARTS$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEPARTS$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDEPRINT$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEPRINT$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDECORE$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDECORE$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDEUI$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEUI$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KFM$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KFM$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KFILE$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KFILE$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KAB$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KAB$])

@ -3368,9 +3368,9 @@ m4trace:configure.in:61: -1- m4_pattern_allow([^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_TRACE([kde_moduledir]) m4trace:configure.in:61: -1- AC_SUBST_TRACE([kde_moduledir])
m4trace:configure.in:61: -1- m4_pattern_allow([^kde_moduledir$]) m4trace:configure.in:61: -1- m4_pattern_allow([^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_TRACE([kdeinitdir]) m4trace:configure.in:61: -1- AC_SUBST_TRACE([tdeinitdir])
m4trace:configure.in:61: -1- m4_pattern_allow([^kdeinitdir$]) m4trace:configure.in:61: -1- m4_pattern_allow([^tdeinitdir$])
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_TRACE([kde_styledir]) m4trace:configure.in:61: -1- AC_SUBST_TRACE([kde_styledir])
m4trace:configure.in:61: -1- m4_pattern_allow([^kde_styledir$]) m4trace:configure.in:61: -1- m4_pattern_allow([^kde_styledir$])
@ -3380,15 +3380,15 @@ m4trace:configure.in:61: -1- m4_pattern_allow([^kde_widgetdir$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KDED], [$lib_kded]) m4trace:configure.in:61: -1- AC_SUBST([LIB_KDED], [$lib_kded])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KDED]) m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KDED])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDED$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDED$])
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_TRACE([LIB_KDECORE]) m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDECORE])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDECORE$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDECORE$])
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_TRACE([LIB_KDEUI]) m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDEUI])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDEUI$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEUI$])
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_TRACE([LIB_KIO]) m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDEIO])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KIO$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEIO$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KJS], ["-lkjs"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_KJS], ["-lkjs"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KJS]) m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KJS])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KJS$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KJS$])
@ -3398,91 +3398,91 @@ m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_SMB$])
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_TRACE([LIB_KAB]) m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KAB])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KAB$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KAB$])
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_TRACE([LIB_KABC]) m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KABC])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KABC$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KABC$])
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_TRACE([LIB_KHTML]) m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDEHTML])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KHTML$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEHTML$])
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_TRACE([LIB_KSPELL]) m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDESPELL])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KSPELL$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDESPELL$])
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_TRACE([LIB_KPARTS]) m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDEPARTS])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KPARTS$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEPARTS$])
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_TRACE([LIB_KDEPRINT]) m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDEPRINT])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDEPRINT$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEPRINT$])
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_TRACE([LIB_KUTILS]) m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDEUTILS])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KUTILS$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEUTILS$])
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_TRACE([LIB_KDEPIM]) m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDEPIM])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDEPIM$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEPIM$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KIMPROXY], ["-lkimproxy"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEIMPROXY], ["-ltdeimproxy"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KIMPROXY]) m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDEIMPROXY])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KIMPROXY$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEIMPROXY$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KNEWSTUFF], ["-lknewstuff"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_KNEWSTUFF], ["-lknewstuff"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KNEWSTUFF]) m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KNEWSTUFF])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KNEWSTUFF$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KNEWSTUFF$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KDNSSD], ["-lkdnssd"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEDNSSD], ["-ltdednssd"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KDNSSD]) m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDEDNSSD])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDNSSD$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEDNSSD$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KUNITTEST], ["-lkunittest"]) m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEUNITTEST], ["-ltdeunittest"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KUNITTEST]) m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDEUNITTEST])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KUNITTEST$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEUNITTEST$])
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_TRACE([LIB_KSYCOCA]) m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDESYCOCA])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KSYCOCA$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDESYCOCA$])
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_TRACE([LIB_KFILE]) m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KFILE])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KFILE$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KFILE$])
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_TRACE([LIB_KDECORE]) m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDECORE])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDECORE$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDECORE$])
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_TRACE([LIB_KDEUI]) m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDEUI])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDEUI$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEUI$])
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_TRACE([LIB_KIO]) m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDEIO])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KIO$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEIO$])
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_TRACE([LIB_KSYCOCA]) m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDESYCOCA])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KSYCOCA$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDESYCOCA$])
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_TRACE([LIB_SMB]) m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_SMB])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_SMB$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_SMB$])
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_TRACE([LIB_KFILE]) m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KFILE])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KFILE$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KFILE$])
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_TRACE([LIB_KAB]) m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KAB])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KAB$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KAB$])
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_TRACE([LIB_KHTML]) m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDEHTML])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KHTML$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEHTML$])
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_TRACE([LIB_KSPELL]) m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDESPELL])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KSPELL$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDESPELL$])
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_TRACE([LIB_KPARTS]) m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDEPARTS])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KPARTS$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEPARTS$])
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_TRACE([LIB_KDEPRINT]) m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDEPRINT])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDEPRINT$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEPRINT$])
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_TRACE([LIB_KDECORE]) m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDECORE])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDECORE$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDECORE$])
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_TRACE([LIB_KDEUI]) m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDEUI])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDEUI$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEUI$])
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_TRACE([LIB_KFM]) m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KFM])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KFM$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KFM$])
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_TRACE([LIB_KFILE]) m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KFILE])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KFILE$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KFILE$])
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:61: -1- AC_SUBST_TRACE([LIB_KAB]) m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KAB])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KAB$]) m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KAB$])
m4trace:configure.in:69: -1- AC_DEFINE_TRACE_LITERAL([WORDS_BIGENDIAN]) m4trace:configure.in:69: -1- AC_DEFINE_TRACE_LITERAL([WORDS_BIGENDIAN])

@ -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 find "<application>find 0.1</application>"> <!ENTITY find "<application>find 0.1</application>">
<!ENTITY kappname "&find;"><!-- Do *not* replace kappname--> <!ENTITY kappname "&find;"><!-- 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 -->
@ -158,17 +158,17 @@ patent issues. -->
<para>It slices! It dices! and it comes with a free toaster!</para> <para>It slices! It dices! and it comes with a free toaster!</para>
<para> <para>
The Squiggle Tool <guiicon><inlinemediaobject> The Stquiggle Tool <guiicon><inlinemediaobject>
<imageobject> <imageobject>
<imagedata fileref="squiggle.png" format="PNG"/> <imagedata fileref="stquiggle.png" format="PNG"/>
</imageobject> </imageobject>
<imageobject> <imageobject>
<imagedata fileref="squiggle.eps" format="EPS"/> <imagedata fileref="stquiggle.eps" format="EPS"/>
</imageobject> </imageobject>
<textobject> <textobject>
<phrase>Squiggle</phrase> <phrase>Stquiggle</phrase>
</textobject> </textobject>
</inlinemediaobject></guiicon> is used to draw squiggly lines all over </inlinemediaobject></guiicon> is used to draw stquiggly lines all over
the &find; main window. It's not a bug, it's a feature! the &find; main window. It's not a bug, it's a feature!
</para> </para>
@ -441,7 +441,7 @@ Program copyright 2007 Andreas Eckstein <email>andreas.eckstein@gmx.net</email>
<para> <para>
Contributors: Contributors:
<itemizedlist> <itemizedlist>
<listitem><para>Konqui the KDE Dragon <email>konqui@kde.org</email></para> <listitem><para>Kontqui the KDE Dragon <email>kontqui@kde.org</email></para>
</listitem> </listitem>
<listitem><para>Tux the Linux Penguin <email>tux@linux.org</email></para> <listitem><para>Tux the Linux Penguin <email>tux@linux.org</email></para>
</listitem> </listitem>
@ -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

@ -1,15 +1,15 @@
INCLUDES = $(all_includes) INCLUDES = $(all_includes)
kde_module_LTLIBRARIES = kio_find.la kde_module_LTLIBRARIES = tdeio_find.la
kio_find_la_SOURCES = find.cpp findimpl.cpp findurl.cpp trackerfindclient.cpp tdeio_find_la_SOURCES = find.cpp findimpl.cpp findurl.cpp trackerfindclient.cpp
kio_find_la_LIBADD = -lkio tdeio_find_la_LIBADD = -ltdeio
kio_find_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN) tdeio_find_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN)
protocol_DATA = find.protocol protocol_DATA = find.protocol
protocoldir = $(kde_servicesdir) protocoldir = $(kde_servicesdir)
messages: rc.cpp messages: rc.cpp
$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kio_find.pot $(XGETTEXT) *.cpp -o $(podir)/tdeio_find.pot
noinst_HEADERS = findimpl.h findurl.h trackerfindclient.h noinst_HEADERS = findimpl.h findurl.h trackerfindclient.h

@ -19,56 +19,56 @@
***************************************************************************/ ***************************************************************************/
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <tdelocale.h>
#include <kapplication.h> #include <tdeapplication.h>
#include <dcopclient.h> #include <dcopclient.h>
#include <kcmdlineargs.h> #include <tdecmdlineargs.h>
#include <kglobal.h> #include <tdeglobal.h>
#include "findurl.h" #include "findurl.h"
#include "find.h" #include "find.h"
static const KCmdLineOptions options[] = static const TDECmdLineOptions options[] =
{ {
{ "+protocol", I18N_NOOP( "Protocol name" ), 0 }, { "+protocol", I18N_NOOP( "Protocol name" ), 0 },
{ "+pool", I18N_NOOP( "Socket name" ), 0 }, { "+pool", I18N_NOOP( "Socket name" ), 0 },
{ "+app", I18N_NOOP( "Socket name" ), 0 }, { "+app", I18N_NOOP( "Socket name" ), 0 },
KCmdLineLastOption TDECmdLineLastOption
}; };
extern "C" { extern "C" {
int KDE_EXPORT kdemain( int argc, char **argv ) int KDE_EXPORT kdemain( int argc, char **argv )
{ {
putenv(strdup("SESSION_MANAGER=")); putenv(strdup("SESSION_MANAGER="));
KCmdLineArgs::init(argc, argv, "kio_find", 0, 0, 0, 0); TDECmdLineArgs::init(argc, argv, "tdeio_find", 0, 0, 0, 0);
KCmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
KApplication app( false, false ); TDEApplication app( false, false );
app.dcopClient()->attach(); app.dcopClient()->attach();
KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
kio_findProtocol slave( args->arg(0), args->arg(1), args->arg(2) ); tdeio_findProtocol slave( args->arg(0), args->arg(1), args->arg(2) );
slave.dispatchLoop(); slave.dispatchLoop();
return 0; return 0;
} }
} }
kio_findProtocol::kio_findProtocol(const QCString &protocol, tdeio_findProtocol::tdeio_findProtocol(const TQCString &protocol,
const QCString &pool, const QCString &app) const TQCString &pool, const TQCString &app)
: SlaveBase(protocol, pool, app) : SlaveBase(protocol, pool, app)
{ {
} }
kio_findProtocol::~kio_findProtocol() tdeio_findProtocol::~tdeio_findProtocol()
{ {
} }
void kio_findProtocol::listDir(const KURL &url) void tdeio_findProtocol::listDir(const KURL &url)
{ {
FindURL furl(url); FindURL furl(url);
if(furl.isMalformed()) if(furl.isMalformed())
{ {
malformedError(url, QString("listDir"), furl); malformedError(url, TQString("listDir"), furl);
return; return;
} }
@ -79,8 +79,8 @@ void kio_findProtocol::listDir(const KURL &url)
return; return;
} }
KIO::UDSEntry entry; TDEIO::UDSEntry entry;
KIO::UDSEntryList result_list; TDEIO::UDSEntryList result_list;
if(furl.hasSearch()) if(furl.hasSearch())
{ {
@ -105,13 +105,13 @@ void kio_findProtocol::listDir(const KURL &url)
return; return;
} }
void kio_findProtocol::stat(const KURL &url) void tdeio_findProtocol::stat(const KURL &url)
{ {
FindURL furl(url); FindURL furl(url);
if (furl.isMalformed()) if (furl.isMalformed())
{ {
malformedError(url, QString("rewriteURL"), furl); malformedError(url, TQString("rewriteURL"), furl);
return; return;
} }
@ -124,23 +124,23 @@ void kio_findProtocol::stat(const KURL &url)
if(!furl.hasSearch()) if(!furl.hasSearch())
{ {
KIO::UDSEntry entry; TDEIO::UDSEntry entry;
m_impl.createTopLevelEntry(entry); m_impl.createTopLevelEntry(entry);
statEntry(entry); statEntry(entry);
finished(); finished();
return; return;
} }
KIO::UDSEntry entry; TDEIO::UDSEntry entry;
m_impl.createSearchSecondLevelEntry(entry , furl.search()); m_impl.createSearchSecondLevelEntry(entry , furl.search());
statEntry(entry); statEntry(entry);
finished(); finished();
return; return;
} }
void kio_findProtocol::malformedError(const KURL& url, QString func, FindURL& furl) void tdeio_findProtocol::malformedError(const KURL& url, TQString func, FindURL& furl)
{ {
QString msg = url.url() + ", " + func + ", path=" + url.path() + "|search=" + furl.search() + "|filter=" + furl.filter() + "|query=" + furl.query() + "|ref=" + furl.ref(); TQString msg = url.url() + ", " + func + ", path=" + url.path() + "|search=" + furl.search() + "|filter=" + furl.filter() + "|query=" + furl.query() + "|ref=" + furl.ref();
error(KIO::ERR_MALFORMED_URL, msg); error(TDEIO::ERR_MALFORMED_URL, msg);
} }

@ -18,22 +18,22 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifndef KIO_FIND_H #ifndef TDEIO_FIND_H
#define KIO_FIND_H #define TDEIO_FIND_H
#include <kio/forwardingslavebase.h> #include <tdeio/forwardingslavebase.h>
#include "findimpl.h" #include "findimpl.h"
class kio_findProtocol : public KIO::SlaveBase class tdeio_findProtocol : public TDEIO::SlaveBase
{ {
public: public:
kio_findProtocol(const QCString &protocol, const QCString &pool, const QCString &app); tdeio_findProtocol(const TQCString &protocol, const TQCString &pool, const TQCString &app);
virtual ~kio_findProtocol(); virtual ~tdeio_findProtocol();
virtual void listDir(const KURL &url); virtual void listDir(const KURL &url);
virtual void stat(const KURL &url); virtual void stat(const KURL &url);
private: private:
void malformedError(const KURL& url, QString func, FindURL& furl); void malformedError(const KURL& url, TQString func, FindURL& furl);
FindImpl m_impl; FindImpl m_impl;
}; };

@ -1,5 +1,5 @@
[Protocol] [Protocol]
exec=kio_find exec=tdeio_find
protocol=find protocol=find
input=none input=none
output=filesystem output=filesystem
@ -11,6 +11,6 @@ moving=false
linking=false linking=false
#defaultMimetype=inode/directory #defaultMimetype=inode/directory
Icon=find Icon=find
Description=A kioslave for the 'tracker' indexing and search backend Description=A tdeioslave for the 'tracker' indexing and search backend
URIMode=URL URIMode=URL
Class=:local Class=:local

@ -22,16 +22,16 @@
#include "findimpl.h" #include "findimpl.h"
const QString FindImpl::history_dir_name=QString(".find_history.d"); const TQString FindImpl::history_dir_name=TQString(".find_history.d");
void FindImpl::applyFilter(ResultList& list, FindURL& url) void FindImpl::applyFilter(ResultList& list, FindURL& url)
{ {
if(!url.hasFilter()) if(!url.hasFilter())
return; return;
QString filter = url.filter().replace('.', "\\."); TQString filter = url.filter().replace('.', "\\.");
filter = filter.replace('*', "[^\\/]*") + "$"; filter = filter.replace('*', "[^\\/]*") + "$";
QRegExp re(filter, false); TQRegExp re(filter, false);
ResultListIterator iter = ResultListIterator(list); ResultListIterator iter = ResultListIterator(list);
while(iter.current() != NULL) while(iter.current() != NULL)
@ -43,9 +43,9 @@ void FindImpl::applyFilter(ResultList& list, FindURL& url)
} }
} }
static void addAtom(KIO::UDSEntry &entry, unsigned int ID, long l, const QString &s = QString::null) static void addAtom(TDEIO::UDSEntry &entry, unsigned int ID, long l, const TQString &s = TQString::null)
{ {
KIO::UDSAtom atom; TDEIO::UDSAtom atom;
atom.m_uds = ID; atom.m_uds = ID;
atom.m_long = l; atom.m_long = l;
atom.m_str = s; atom.m_str = s;
@ -54,25 +54,25 @@ static void addAtom(KIO::UDSEntry &entry, unsigned int ID, long l, const QString
FindImpl::FindImpl() FindImpl::FindImpl()
{ {
history_dir.setPath(QDir::homeDirPath() + "/" + history_dir_name); history_dir.setPath(TQDir::homeDirPath() + "/" + history_dir_name);
} }
void FindImpl::appendToHistory(FindURL& furl) void FindImpl::appendToHistory(FindURL& furl)
{ {
QFile _history_file(history_dir.path() + "/" + furl.prettyURL().replace('/', "_")); TQFile _history_file(history_dir.path() + "/" + furl.prettyURL().replace('/', "_"));
if(!history_dir.exists()) if(!history_dir.exists())
if(!QDir::home().mkdir(history_dir_name)) if(!TQDir::home().mkdir(history_dir_name))
return; return;
if(_history_file.open(IO_WriteOnly|IO_Append)) if(_history_file.open(IO_WriteOnly|IO_Append))
{ {
QTextStream stream(&_history_file); TQTextStream stream(&_history_file);
_history_file.close(); _history_file.close();
} }
} }
void FindImpl::parseHistory(QValueList<KIO::UDSEntry> &list) void FindImpl::parseHistory(TQValueList<TDEIO::UDSEntry> &list)
{ {
history_dir.refresh(); history_dir.refresh();
@ -82,8 +82,8 @@ void FindImpl::parseHistory(QValueList<KIO::UDSEntry> &list)
if(history_dir.count()==0) if(history_dir.count()==0)
return; return;
QFileInfoListIterator it(*history_dir.entryInfoList()); TQFileInfoListIterator it(*history_dir.entryInfoList());
QFileInfo *info; TQFileInfo *info;
while(it.current() != NULL) while(it.current() != NULL)
{ {
@ -91,15 +91,15 @@ void FindImpl::parseHistory(QValueList<KIO::UDSEntry> &list)
if(info->isFile()) if(info->isFile())
{ {
FindURL url(info->baseName().replace('_', "/")); FindURL url(info->baseName().replace('_', "/"));
KIO::UDSEntry entry; TDEIO::UDSEntry entry;
addAtom(entry, KIO::UDS_URL, 0, url.prettyURL()); addAtom(entry, TDEIO::UDS_URL, 0, url.prettyURL());
addAtom(entry, KIO::UDS_NAME, 0, url.search()); addAtom(entry, TDEIO::UDS_NAME, 0, url.search());
addAtom(entry, KIO::UDS_FILE_TYPE, S_IFDIR); addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFDIR);
addAtom(entry, KIO::UDS_MODIFICATION_TIME, info->lastModified().toTime_t(), QString::null); addAtom(entry, TDEIO::UDS_MODIFICATION_TIME, info->lastModified().toTime_t(), TQString::null);
addAtom(entry, KIO::UDS_ACCESS_TIME, info->lastRead().toTime_t(), QString::null); addAtom(entry, TDEIO::UDS_ACCESS_TIME, info->lastRead().toTime_t(), TQString::null);
addAtom(entry, KIO::UDS_CREATION_TIME, info->created().toTime_t(), QString::null); addAtom(entry, TDEIO::UDS_CREATION_TIME, info->created().toTime_t(), TQString::null);
addAtom(entry, KIO::UDS_MIME_TYPE, 0, "inode/directory"); addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, "inode/directory");
addAtom(entry, KIO::UDS_ICON_NAME, 0, getIcon(url)); addAtom(entry, TDEIO::UDS_ICON_NAME, 0, getIcon(url));
list.append(entry); list.append(entry);
} }
@ -107,7 +107,7 @@ void FindImpl::parseHistory(QValueList<KIO::UDSEntry> &list)
} }
} }
bool FindImpl::getBasename(QString& path, QString& basename) bool FindImpl::getBasename(TQString& path, TQString& basename)
{ {
int i = path.findRev('/'); int i = path.findRev('/');
if (i > 0) if (i > 0)
@ -119,19 +119,19 @@ bool FindImpl::getBasename(QString& path, QString& basename)
basename = path; basename = path;
} }
return basename != QString::null; return basename != TQString::null;
} }
static void addSearchEntry(QValueList<KIO::UDSEntry> &list, QString& path, QString& label) static void addSearchEntry(TQValueList<TDEIO::UDSEntry> &list, TQString& path, TQString& label)
{ {
KIO::UDSEntry entry; TDEIO::UDSEntry entry;
addAtom(entry, KIO::UDS_URL, 0, path); addAtom(entry, TDEIO::UDS_URL, 0, path);
addAtom(entry, KIO::UDS_NAME, 0, label); addAtom(entry, TDEIO::UDS_NAME, 0, label);
list.append(entry); list.append(entry);
} }
bool FindImpl::listSearch(FindURL& furl, QValueList<KIO::UDSEntry> &list) bool FindImpl::listSearch(FindURL& furl, TQValueList<TDEIO::UDSEntry> &list)
{ {
uint count=0; uint count=0;
TrackerFindClient tfclient; TrackerFindClient tfclient;
@ -145,8 +145,8 @@ bool FindImpl::listSearch(FindURL& furl, QValueList<KIO::UDSEntry> &list)
for(; iter.current() != NULL; ++iter) for(; iter.current() != NULL; ++iter)
{ {
QString path = "file://" + (*iter)->path; TQString path = "file://" + (*iter)->path;
QString basename; TQString basename;
if(getBasename(path, basename)) if(getBasename(path, basename))
addSearchEntry(list, path, basename); addSearchEntry(list, path, basename);
count++; count++;
@ -159,35 +159,35 @@ bool FindImpl::listSearch(FindURL& furl, QValueList<KIO::UDSEntry> &list)
return true; return true;
} }
bool FindImpl::listSearches(QValueList<KIO::UDSEntry> &list) bool FindImpl::listSearches(TQValueList<TDEIO::UDSEntry> &list)
{ {
parseHistory(list); parseHistory(list);
return true; return true;
} }
void FindImpl::createTopLevelEntry(KIO::UDSEntry &entry) const void FindImpl::createTopLevelEntry(TDEIO::UDSEntry &entry) const
{ {
entry.clear(); entry.clear();
addAtom(entry, KIO::UDS_NAME, 0, "."); addAtom(entry, TDEIO::UDS_NAME, 0, ".");
addAtom(entry, KIO::UDS_FILE_TYPE, S_IFDIR); addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFDIR);
addAtom(entry, KIO::UDS_ACCESS, 0555); addAtom(entry, TDEIO::UDS_ACCESS, 0555);
addAtom(entry, KIO::UDS_MIME_TYPE, 0, "inode/directory"); addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, "inode/directory");
addAtom(entry, KIO::UDS_ICON_NAME, 0, "find"); addAtom(entry, TDEIO::UDS_ICON_NAME, 0, "find");
addAtom(entry, KIO::UDS_USER, 0, "root"); addAtom(entry, TDEIO::UDS_USER, 0, "root");
addAtom(entry, KIO::UDS_GROUP, 0, "root"); addAtom(entry, TDEIO::UDS_GROUP, 0, "root");
} }
void FindImpl::createSearchSecondLevelEntry(KIO::UDSEntry &entry, QString searchstring) const void FindImpl::createSearchSecondLevelEntry(TDEIO::UDSEntry &entry, TQString searchstring) const
{ {
entry.clear(); entry.clear();
addAtom(entry, KIO::UDS_NAME, 0, "."); addAtom(entry, TDEIO::UDS_NAME, 0, ".");
addAtom(entry, KIO::UDS_FILE_TYPE, S_IFDIR); addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFDIR);
addAtom(entry, KIO::UDS_ACCESS, 0555); addAtom(entry, TDEIO::UDS_ACCESS, 0555);
addAtom(entry, KIO::UDS_MIME_TYPE, 0, "inode/directory"); addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, "inode/directory");
addAtom(entry, KIO::UDS_ICON_NAME, 0, "kfind"); addAtom(entry, TDEIO::UDS_ICON_NAME, 0, "kfind");
addAtom(entry, KIO::UDS_USER, 0, "root"); addAtom(entry, TDEIO::UDS_USER, 0, "root");
addAtom(entry, KIO::UDS_GROUP, 0, "root"); addAtom(entry, TDEIO::UDS_GROUP, 0, "root");
} }
const char* FindImpl::getIcon(FindURL &url) const char* FindImpl::getIcon(FindURL &url)

@ -21,15 +21,15 @@
#ifndef FINDIMPL_H #ifndef FINDIMPL_H
#define FINDIMPL_H #define FINDIMPL_H
#include <kio/global.h> #include <tdeio/global.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <qdir.h> #include <qdir.h>
#include <qpixmap.h> #include <qpixmap.h>
#include "trackerfindclient.h" #include "trackerfindclient.h"
#include "findurl.h" #include "findurl.h"
class FindImpl : public QObject class FindImpl : public TQObject
{ {
//Q_OBJECT //Q_OBJECT
@ -37,17 +37,17 @@ public:
FindImpl(); FindImpl();
void applyFilter(ResultList& list, FindURL& url); void applyFilter(ResultList& list, FindURL& url);
void appendToHistory(FindURL& furl); void appendToHistory(FindURL& furl);
void parseHistory(QValueList<KIO::UDSEntry> &list); void parseHistory(TQValueList<TDEIO::UDSEntry> &list);
bool listSearches(QValueList<KIO::UDSEntry> &list); bool listSearches(TQValueList<TDEIO::UDSEntry> &list);
void createTopLevelEntry(KIO::UDSEntry &entry) const; void createTopLevelEntry(TDEIO::UDSEntry &entry) const;
void createSearchSecondLevelEntry(KIO::UDSEntry &entry, QString searchstring) const; void createSearchSecondLevelEntry(TDEIO::UDSEntry &entry, TQString searchstring) const;
bool listSearch(FindURL& furl, QValueList<KIO::UDSEntry> &list); bool listSearch(FindURL& furl, TQValueList<TDEIO::UDSEntry> &list);
private: private:
bool getBasename(QString& path, QString& basename); bool getBasename(TQString& path, TQString& basename);
const char *getIcon(FindURL &url); const char *getIcon(FindURL &url);
QDir history_dir; TQDir history_dir;
static const QString history_dir_name; static const TQString history_dir_name;
}; };
#endif #endif

@ -33,23 +33,23 @@ FindURL::FindURL(const KURL& kurl) : KURL(kurl)
parsePath(); parsePath();
} }
FindURL::FindURL(QString urlstring) : KURL(urlstring) FindURL::FindURL(TQString urlstring) : KURL(urlstring)
{ {
parsePath(); parsePath();
} }
bool FindURL::hasFilter() bool FindURL::hasFilter()
{ {
return m_filter!=QString::null; return m_filter!=TQString::null;
} }
bool FindURL::hasSearch() bool FindURL::hasSearch()
{ {
return m_search!=QString::null; return m_search!=TQString::null;
} }
bool FindURL::parsePath() bool FindURL::parsePath()
{ {
QString p = path(); TQString p = path();
normalised = false; normalised = false;
malformed = false; malformed = false;
@ -79,7 +79,7 @@ bool FindURL::parsePath()
return false; return false;
} }
QString nsearch = m_search.simplifyWhiteSpace(); TQString nsearch = m_search.simplifyWhiteSpace();
nsearch = nsearch.replace(' ', "+"); nsearch = nsearch.replace(' ', "+");
if(nsearch!=m_search) if(nsearch!=m_search)
@ -88,7 +88,7 @@ bool FindURL::parsePath()
m_search = nsearch; m_search = nsearch;
} }
QString np = "/"; TQString np = "/";
np += (m_search + "/" + m_filter); np += (m_search + "/" + m_filter);
setPath(np); setPath(np);
@ -106,12 +106,12 @@ bool FindURL::isNormalised()
return normalised; return normalised;
} }
QString FindURL::search() TQString FindURL::search()
{ {
return m_search; return m_search;
} }
QString FindURL::filter() TQString FindURL::filter()
{ {
return m_filter; return m_filter;
} }

@ -26,7 +26,7 @@
class FindURL : public KURL class FindURL : public KURL
{ {
public: public:
FindURL(QString urlstring); FindURL(TQString urlstring);
FindURL(KURL& url); FindURL(KURL& url);
FindURL(const KURL& url); FindURL(const KURL& url);
@ -34,8 +34,8 @@ public:
bool isNormalised(); bool isNormalised();
bool isMalformed(); bool isMalformed();
QString filter(); TQString filter();
QString search(); TQString search();
int port(); int port();
bool hasFilter(); bool hasFilter();
bool hasSearch(); bool hasSearch();
@ -43,10 +43,10 @@ public:
private: private:
bool malformed; bool malformed;
bool normalised; bool normalised;
bool parseURL(QString path); bool parseURL(TQString path);
bool parsePath(); bool parsePath();
QString m_filter; TQString m_filter;
QString m_search; TQString m_search;
}; };
#endif #endif

@ -1,7 +1,7 @@
/* Tracker - indexer and metadata database engine /* Tracker - indexer and metadata database engine
* Copyright (C) 2006, Mr Jamie McCracken (jamiemcc@gnome.org) * Copyright (C) 2006, Mr Jamie McCracken (jamiemcc@gnome.org)
* *
* Slightly adjusted by Andreas Eckstein for use in the kio-find project * Slightly adjusted by Andreas Eckstein for use in the tdeio-find project
* (changed 'class' variable names to 'classname') * (changed 'class' variable names to 'classname')
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or

@ -58,7 +58,7 @@ const char *TrackerFindClient::getServiceIcon(ServiceType s)
case SERVICE_TEXT_FILES: case SERVICE_TEXT_FILES:
return "kate"; return "kate";
case SERVICE_DEVELOPMENT_FILES: case SERVICE_DEVELOPMENT_FILES:
return "kdevelop"; return "tdevelop";
default: default:
return "kviewshell"; return "kviewshell";
} }
@ -72,7 +72,7 @@ ServiceType TrackerFindClient::getServiceType(FindURL &url)
} }
else else
{ {
QString ref = url.ref().lower(); TQString ref = url.ref().lower();
if (ref=="doc"||ref=="document"||ref=="documents") { if (ref=="doc"||ref=="document"||ref=="documents") {
return SERVICE_DOCUMENTS; return SERVICE_DOCUMENTS;
@ -102,7 +102,7 @@ bool TrackerFindClient::search(FindURL url)
TrackerClient *client = NULL; TrackerClient *client = NULL;
GError *error = NULL; GError *error = NULL;
ServiceType type; ServiceType type;
QCString qcsearch = url.search().utf8(); TQCString qcsearch = url.search().utf8();
char search[qcsearch.length()*3+1];// \0 not included! char search[qcsearch.length()*3+1];// \0 not included!
strcpy(search, (const char*)qcsearch); strcpy(search, (const char*)qcsearch);
@ -136,7 +136,7 @@ bool TrackerFindClient::search(FindURL url)
while((search_results[i]!=NULL)&&(i<=limit)) while((search_results[i]!=NULL)&&(i<=limit))
{ {
results.append(new FindResult(QString::fromUtf8(search_results[i]))); results.append(new FindResult(TQString::fromUtf8(search_results[i])));
i++; i++;
} }

@ -33,23 +33,23 @@ extern "C"
class FindResult class FindResult
{ {
public: public:
FindResult(QString p, QString m) FindResult(TQString p, TQString m)
{ {
path=p; path=p;
mimeType=m; mimeType=m;
} }
FindResult(QString p) FindResult(TQString p)
{ {
path=p; path=p;
} }
QString path; TQString path;
QString mimeType; TQString mimeType;
}; };
typedef QPtrList<FindResult> ResultList; typedef TQPtrList<FindResult> ResultList;
typedef QPtrListIterator<FindResult> ResultListIterator; typedef TQPtrListIterator<FindResult> ResultListIterator;
class FindBackend class FindBackend
{ {

Loading…
Cancel
Save