Browse Source

Automated conversion to TQt and TDE APIs

master
Timothy Pearson 6 years ago
parent
commit
afe05794c4
19 changed files with 969 additions and 969 deletions
  1. +1
    -1
      ChangeLog
  2. +1
    -1
      INSTALL
  3. +135
    -135
      acinclude.m4
  4. +230
    -230
      autom4te.cache/output.0
  5. +230
    -230
      autom4te.cache/output.1
  6. +163
    -163
      autom4te.cache/traces.0
  7. +78
    -78
      autom4te.cache/traces.1
  8. +9
    -9
      doc/en/index.docbook
  9. +5
    -5
      src/Makefile.am
  10. +25
    -25
      src/find.cpp
  11. +7
    -7
      src/find.h
  12. +2
    -2
      src/find.protocol
  13. +47
    -47
      src/findimpl.cpp
  14. +11
    -11
      src/findimpl.h
  15. +8
    -8
      src/findurl.cpp
  16. +6
    -6
      src/findurl.h
  17. +1
    -1
      src/tracker.h
  18. +4
    -4
      src/trackerfindclient.cpp
  19. +6
    -6
      src/trackerfindclient.h

+ 1
- 1
ChangeLog View File

@@ -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.

+ 1
- 1
INSTALL View File

@@ -150,7 +150,7 @@ operates.
`--help'
Print a summary of the options to `configure', and exit.

`--quiet'
`--tquiet'
`--silent'
`-q'
Do not print messages saying which checks are being made.


+ 135
- 135
acinclude.m4 View File

@@ -23,8 +23,8 @@ dnl IMPORTANT NOTE:
dnl Please do not modify this file unless you expect your modifications to be
dnl carried into every other module in the repository.
dnl
dnl Single-module modifications are best placed in configure.in for kdelibs
dnl and kdebase or configure.in.in if present.
dnl Single-module modifications are best placed in configure.in for tdelibs
dnl and tdebase or configure.in.in if present.

# KDE_PATH_X_DIRECT
dnl Internal subroutine of AC_PATH_X.
@@ -103,41 +103,41 @@ ac_x_libraries=],
[LIBS="$ac_save_LIBS"
# First see if replacing the include by lib works.
# Check X11 before X11Rn because it is often a symlink to the current release.
for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
/usr/X11/lib${kdelibsuff} \
/usr/X11R6/lib${kdelibsuff} \
/usr/X11R5/lib${kdelibsuff} \
/usr/X11R4/lib${kdelibsuff} \
for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \
/usr/X11/lib${tdelibsuff} \
/usr/X11R6/lib${tdelibsuff} \
/usr/X11R5/lib${tdelibsuff} \
/usr/X11R4/lib${tdelibsuff} \
\
/usr/lib${kdelibsuff}/X11 \
/usr/lib${kdelibsuff}/X11R6 \
/usr/lib${kdelibsuff}/X11R5 \
/usr/lib${kdelibsuff}/X11R4 \
/usr/lib${tdelibsuff}/X11 \
/usr/lib${tdelibsuff}/X11R6 \
/usr/lib${tdelibsuff}/X11R5 \
/usr/lib${tdelibsuff}/X11R4 \
\
/usr/local/X11/lib${kdelibsuff} \
/usr/local/X11R6/lib${kdelibsuff} \
/usr/local/X11R5/lib${kdelibsuff} \
/usr/local/X11R4/lib${kdelibsuff} \
/usr/local/X11/lib${tdelibsuff} \
/usr/local/X11R6/lib${tdelibsuff} \
/usr/local/X11R5/lib${tdelibsuff} \
/usr/local/X11R4/lib${tdelibsuff} \
\
/usr/local/lib${kdelibsuff}/X11 \
/usr/local/lib${kdelibsuff}/X11R6 \
/usr/local/lib${kdelibsuff}/X11R5 \
/usr/local/lib${kdelibsuff}/X11R4 \
/usr/local/lib${tdelibsuff}/X11 \
/usr/local/lib${tdelibsuff}/X11R6 \
/usr/local/lib${tdelibsuff}/X11R5 \
/usr/local/lib${tdelibsuff}/X11R4 \
\
/usr/X386/lib${kdelibsuff} \
/usr/x386/lib${kdelibsuff} \
/usr/XFree86/lib${kdelibsuff}/X11 \
/usr/X386/lib${tdelibsuff} \
/usr/x386/lib${tdelibsuff} \
/usr/XFree86/lib${tdelibsuff}/X11 \
\
/usr/lib${kdelibsuff} \
/usr/local/lib${kdelibsuff} \
/usr/unsupported/lib${kdelibsuff} \
/usr/athena/lib${kdelibsuff} \
/usr/local/x11r5/lib${kdelibsuff} \
/usr/lpp/Xamples/lib${kdelibsuff} \
/lib/usr/lib${kdelibsuff}/X11 \
/usr/lib${tdelibsuff} \
/usr/local/lib${tdelibsuff} \
/usr/unsupported/lib${tdelibsuff} \
/usr/athena/lib${tdelibsuff} \
/usr/local/x11r5/lib${tdelibsuff} \
/usr/lpp/Xamples/lib${tdelibsuff} \
/lib/usr/lib${tdelibsuff}/X11 \
\
/usr/openwin/lib${kdelibsuff} \
/usr/openwin/share/lib${kdelibsuff} \
/usr/openwin/lib${tdelibsuff} \
/usr/openwin/share/lib${tdelibsuff} \
; \
do
dnl Don't even attempt the hair of trying to link an X program!
@@ -371,24 +371,24 @@ AC_DEFUN([KDE_1_CHECK_PATHS],
fi

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
AC_MSG_RESULT(yes)
else
AC_MSG_ERROR([your system fails at linking a small KDE application!
Check, if your compiler is installed correctly and if you have used the
same compiler to compile Qt and kdelibs as you did use now.
same compiler to compile Qt and tdelibs as you did use now.
For more details about this problem, look at the end of config.log.])
fi

if eval `KDEDIR= ./conftest 2>&5`; then
if eval `TDEDIR= ./conftest 2>&5`; then
kde_result=done
else
kde_result=problems
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_SET_PATHS($kde_result)
@@ -547,11 +547,11 @@ Please check whether you installed aRts correctly or use
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"
test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
if test -n "$KDEDIRS"; then
test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
if test -n "$TDEDIRS"; then
kde_save_IFS=$IFS
IFS=:
for dir in $KDEDIRS; do
for dir in $TDEDIRS; do
kde_default_bindirs="$dir/bin $kde_default_bindirs "
done
IFS=$kde_save_IFS
@@ -602,18 +602,18 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi

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)])
fi
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)
fi
KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])

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"
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)
if test "$KDE_XSL_STYLESHEET" = "NO"; then
KDE_XSL_STYLESHEET=""
@@ -710,7 +710,7 @@ AC_SUBST(kde_templatesdir)
AC_SUBST(kde_servicesdir)
AC_SUBST(kde_servicetypesdir)
AC_SUBST(kde_moduledir)
AC_SUBST(kdeinitdir, '$(kde_moduledir)')
AC_SUBST(tdeinitdir, '$(kde_moduledir)')
AC_SUBST(kde_styledir)
AC_SUBST(kde_widgetdir)
if test "$kde_qtver" = 1; then
@@ -937,7 +937,7 @@ mips-sgi-irix6*)
ac_x_includes="."
fi
if test -z "$ac_x_libraries"; then
ac_x_libraries="/usr/lib${kdelibsuff}"
ac_x_libraries="/usr/lib${tdelibsuff}"
fi
esac
#from now on we use our own again
@@ -1325,7 +1325,7 @@ AC_ARG_ENABLE(
USING_QT_MT=""

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 ------------------------------------------------------------------------

KDE_MT_LDFLAGS=
@@ -1383,7 +1383,7 @@ dnl ------------------------------------------------------------
fi

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 ------------------------------------------------------------------------

if test "x$kde_use_qt_mt" = "xyes"; then
@@ -1418,7 +1418,7 @@ qt_includes=""
AC_ARG_WITH(qt-dir,
AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]),
[ ac_qt_includes="$withval"/include
ac_qt_libraries="$withval"/lib${kdelibsuff}
ac_qt_libraries="$withval"/lib${tdelibsuff}
ac_qt_bindir="$withval"/bin
])

@@ -1459,7 +1459,7 @@ ac_qt_includes="$qt_incdir"

qt_libdirs=""
for dir in $kde_qt_dirs; do
qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir"
qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir"
done
qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
if test ! "$ac_qt_libraries" = "NO"; then
@@ -1644,11 +1644,11 @@ rm -f actest.ui actest.cpp
AC_MSG_RESULT([$kde_cv_uic_plugins])
if test "$kde_cv_uic_plugins" != yes; then
AC_MSG_ERROR([
you need to install kdelibs first.
you need to install tdelibs first.

If you did install kdelibs, then the Qt version that is picked up by
this configure is not the same version you used to compile kdelibs.
The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the
If you did install tdelibs, then the Qt version that is picked up by
this configure is not the same version you used to compile tdelibs.
The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the
_same Qt version_, compiled with the _same compiler_ and the same Qt
configuration settings.
])
@@ -1785,16 +1785,16 @@ AC_CACHE_VAL(ac_cv_have_kde,

if test "$kde_qtver" = 1; then
kde_check_header="ksock.h"
kde_check_lib="libkdecore.la"
kde_check_lib="libtdecore.la"
else
kde_check_header="ksharedptr.h"
kde_check_lib="libkio.la"
kde_check_lib="libtdeio.la"
fi

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"
test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
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 "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs"
kde_incdirs="$ac_kde_includes $kde_incdirs"
AC_FIND_FILE($kde_check_header, $kde_incdirs, 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!])
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}"
test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/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 "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs"
kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
ac_kde_libraries="$kde_libdir"
@@ -1824,7 +1824,7 @@ fi
if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
AC_MSG_ERROR([
I can't find the designer plugins. These are required and should have been installed
by kdelibs])
by tdelibs])
fi

if test -n "$kde_widgetdir"; then
@@ -1839,7 +1839,7 @@ else
ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
fi

else dnl test -z $1, e.g. from kdelibs
else dnl test -z $1, e.g. from tdelibs

ac_cv_have_kde="have_kde=no"

@@ -1979,20 +1979,20 @@ cat > conftest.$ac_ext <<EOF
#include <kapp.h>

int main() {
printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data());
printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data());
printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data());
printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data());
printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data());
printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data());
printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data());
printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data());
printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data());
printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data());
printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
printf("kde_wallpaperdir=\\"%s\\"\n",
KApplication::kde_wallpaperdir().data());
printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data());
printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data());
TDEApplication::kde_wallpaperdir().data());
printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
printf("kde_moduledir=\\"/tmp/dummy\\"\n");
@@ -2030,7 +2030,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
kde_cxxflags_safe="$CXXFLAGS"

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"

AC_TRY_LINK([
@@ -2064,48 +2064,48 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],

if test $kde_qtver = 3; then
case $host in
*cygwin*) lib_kded="-lkdeinit_kded" ;;
*cygwin*) lib_kded="-ltdeinit_kded" ;;
*) lib_kded="" ;;
esac
AC_SUBST(LIB_KDED, $lib_kded)
AC_SUBST(LIB_KDECORE, "-lkdecore")
AC_SUBST(LIB_KDEUI, "-lkdeui")
AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lkabc")
AC_SUBST(LIB_KHTML, "-lkhtml")
AC_SUBST(LIB_KSPELL, "-lkspell")
AC_SUBST(LIB_KPARTS, "-lkparts")
AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
AC_SUBST(LIB_KUTILS, "-lkutils")
AC_SUBST(LIB_KDEPIM, "-lkdepim")
AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
AC_SUBST(LIB_KABC, "-ltdeabc")
AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-lkdnssd")
AC_SUBST(LIB_KUNITTEST, "-lkunittest")
AC_SUBST(LIB_TDEDNSSD, "-ltdednssd")
AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest")
# these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-lkio")
AC_SUBST(LIB_KFILE, "-lkio")
AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
AC_SUBST(LIB_KFILE, "-ltdeio")
elif test $kde_qtver = 2; then
AC_SUBST(LIB_KDECORE, "-lkdecore")
AC_SUBST(LIB_KDEUI, "-lkdeui")
AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-lksycoca")
AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-lkfile")
AC_SUBST(LIB_KFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-lkhtml")
AC_SUBST(LIB_KSPELL, "-lkspell")
AC_SUBST(LIB_KPARTS, "-lkparts")
AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else
AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
fi
])

@@ -2170,7 +2170,7 @@ if test "x$kde_cv_func_$1" = xyes; then
else
case "$1" in
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
@@ -2489,7 +2489,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
AC_MSG_RESULT(yes)
AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
else
AC_MSG_ERROR(You need giflib30. Please install the kdesupport package)
AC_MSG_ERROR(You need giflib30. Please install the tdesupport package)
fi
])

@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
test "x$jpeg_incdir" = xNO && jpeg_incdir=

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 only warn
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)"
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)"
AC_SUBST(KDE_CHECK_PLUGIN)

@@ -3502,9 +3502,9 @@ AC_DEFUN([KDE_CHECK_LIB64],
AC_ARG_ENABLE(libsuffix,
AC_HELP_STRING([--enable-libsuffix],
[/lib directory suffix (64,32,none,auto[=default])]),
kdelibsuff=$enableval, kdelibsuff="auto")
tdelibsuff=$enableval, tdelibsuff="auto")
if test "$kdelibsuff" = "auto"; then
if test "$tdelibsuff" = "auto"; then
cat > conftest.c << EOF
#include <stdio.h>
@@ -3512,26 +3512,26 @@ int main() {
return 0;
}
EOF
kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
tdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
s,.*/lib\([[^\/]]*\)/.*,\1,
p
}'`
rm -rf conftest.*
fi
if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then
kdelibsuff=
if test "$tdelibsuff" = "no" || test "$tdelibsuff" = "none"; then
tdelibsuff=
fi
if test -z "$kdelibsuff"; then
if test -z "$tdelibsuff"; then
AC_MSG_RESULT([not using lib directory suffix])
AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories)
else
if test "$libdir" = '${exec_prefix}/lib'; then
libdir="$libdir${kdelibsuff}"
libdir="$libdir${tdelibsuff}"
AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms
fi
AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${kdelibsuff}"], Suffix for lib directories)
AC_MSG_RESULT([using lib directory suffix $kdelibsuff])
AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${tdelibsuff}"], Suffix for lib directories)
AC_MSG_RESULT([using lib directory suffix $tdelibsuff])
fi
])

@@ -3549,7 +3549,7 @@ AC_CANONICAL_SYSTEM
AC_ARG_PROGRAM
AM_INIT_AUTOMAKE($1, $2)
AM_DISABLE_LIBRARIES
AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
AC_CHECK_COMPILERS
KDE_PROG_LIBTOOL
AM_KDE_WITH_NLS
@@ -4556,7 +4556,7 @@ fi

PYTHONINC=-I$python_incdir

python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs"
python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs"
AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir)
if test ! -r $python_libdir/libpython$version.so; then
AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)
@@ -4946,14 +4946,14 @@ AC_DEFUN([KDE_CONF_FILES],
AC_SUBST(CONF_FILES)
])dnl

dnl This sets the prefix, for arts and kdelibs
dnl This sets the prefix, for arts and tdelibs
dnl Do NOT use in any other module.
dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde
dnl It only looks at --prefix, TDEDIR and falls back to /usr/local/kde
AC_DEFUN([KDE_SET_PREFIX_CORE],
[
unset CDPATH
dnl make $KDEDIR the default for the installation
AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
dnl make $TDEDIR the default for the installation
AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})

if test "x$prefix" = "xNONE"; then
prefix=$ac_default_prefix
@@ -4977,25 +4977,25 @@ AC_DEFUN([KDE_SET_PREFIX],
unset CDPATH
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.
AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix})
AC_PREFIX_DEFAULT(${TDEDIR:-the kde prefix})

KDE_SET_DEFAULT_BINDIRS
if test "x$prefix" = "xNONE"; then
dnl no prefix given: look for kde-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)
dnl no prefix given: look for tde-config in the PATH and deduce the prefix from it
KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend)
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"
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"
fi

kde_libs_prefix=`$KDECONFIG --prefix`
if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs.
AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs.
This means it has been moved since you installed it.
This won't work. Please recompile kdelibs for the new prefix.
This won't work. Please recompile tdelibs for the new prefix.
])
fi
kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
@@ -5003,7 +5003,7 @@ AC_DEFUN([KDE_SET_PREFIX],
AC_MSG_CHECKING([where to install])
if test "x$prefix" = "xNONE"; then
prefix=$kde_libs_prefix
AC_MSG_RESULT([$prefix (as returned by kde-config)])
AC_MSG_RESULT([$prefix (as returned by tde-config)])
else
dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different
given_prefix=$prefix
@@ -5660,7 +5660,7 @@ ssl_includes=""
AC_ARG_WITH(ssl-dir,
AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]),
[ ac_ssl_includes="$withval"/include
ac_ssl_libraries="$withval"/lib$kdelibsuff
ac_ssl_libraries="$withval"/lib$tdelibsuff
])

want_ssl=yes
@@ -5680,7 +5680,7 @@ AC_CACHE_VAL(ac_cv_have_ssl,
AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir)
ac_ssl_includes="$ssl_incdir"

ssl_libdirs="/usr/lib$kdelibsuff /usr/local/lib$kdelibsuff /usr/ssl/lib$kdelibsuff /usr/local/ssl/lib$kdelibsuff $libdir $prefix/lib$kdelibsuff $exec_prefix/lib$kdelibsuff $kde_extra_libs"
ssl_libdirs="/usr/lib$tdelibsuff /usr/local/lib$tdelibsuff /usr/ssl/lib$tdelibsuff /usr/local/ssl/lib$tdelibsuff $libdir $prefix/lib$tdelibsuff $exec_prefix/lib$tdelibsuff $kde_extra_libs"
if test ! "$ac_ssl_libraries" = "NO"; then
ssl_libdirs="$ac_ssl_libraries $ssl_libdirs"
fi
@@ -5917,9 +5917,9 @@ dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page
dnl also defines KSTUFF_PKG_ERRORS on error
AC_DEFUN([KDE_PKG_CHECK_MODULES], [

PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
PKG_CONFIG_PATH="$prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
if test "$prefix" != "$kde_libs_prefix"; then
PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
PKG_CONFIG_PATH="$kde_libs_prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
fi
export PKG_CONFIG_PATH
PKG_CHECK_MODULES([$1],[$2],[$3],[$4])
@@ -10384,7 +10384,7 @@ EOF
# Now try to grab the symbols.
nlist=conftest.nm
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
mv -f "$nlist"T "$nlist"
else


+ 230
- 230
autom4te.cache/output.0
File diff suppressed because it is too large
View File


+ 230
- 230
autom4te.cache/output.1
File diff suppressed because it is too large
View File


+ 163
- 163
autom4te.cache/traces.0 View File

@@ -647,41 +647,41 @@ ac_x_libraries=],
[LIBS="$ac_save_LIBS"
# First see if replacing the include by lib works.
# Check X11 before X11Rn because it is often a symlink to the current release.
for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
/usr/X11/lib${kdelibsuff} \
/usr/X11R6/lib${kdelibsuff} \
/usr/X11R5/lib${kdelibsuff} \
/usr/X11R4/lib${kdelibsuff} \
for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \
/usr/X11/lib${tdelibsuff} \
/usr/X11R6/lib${tdelibsuff} \
/usr/X11R5/lib${tdelibsuff} \
/usr/X11R4/lib${tdelibsuff} \
\
/usr/lib${kdelibsuff}/X11 \
/usr/lib${kdelibsuff}/X11R6 \
/usr/lib${kdelibsuff}/X11R5 \
/usr/lib${kdelibsuff}/X11R4 \
/usr/lib${tdelibsuff}/X11 \
/usr/lib${tdelibsuff}/X11R6 \
/usr/lib${tdelibsuff}/X11R5 \
/usr/lib${tdelibsuff}/X11R4 \
\
/usr/local/X11/lib${kdelibsuff} \
/usr/local/X11R6/lib${kdelibsuff} \
/usr/local/X11R5/lib${kdelibsuff} \
/usr/local/X11R4/lib${kdelibsuff} \
/usr/local/X11/lib${tdelibsuff} \
/usr/local/X11R6/lib${tdelibsuff} \
/usr/local/X11R5/lib${tdelibsuff} \
/usr/local/X11R4/lib${tdelibsuff} \
\
/usr/local/lib${kdelibsuff}/X11 \
/usr/local/lib${kdelibsuff}/X11R6 \
/usr/local/lib${kdelibsuff}/X11R5 \
/usr/local/lib${kdelibsuff}/X11R4 \
/usr/local/lib${tdelibsuff}/X11 \
/usr/local/lib${tdelibsuff}/X11R6 \
/usr/local/lib${tdelibsuff}/X11R5 \
/usr/local/lib${tdelibsuff}/X11R4 \
\
/usr/X386/lib${kdelibsuff} \
/usr/x386/lib${kdelibsuff} \
/usr/XFree86/lib${kdelibsuff}/X11 \
/usr/X386/lib${tdelibsuff} \
/usr/x386/lib${tdelibsuff} \
/usr/XFree86/lib${tdelibsuff}/X11 \
\
/usr/lib${kdelibsuff} \
/usr/local/lib${kdelibsuff} \
/usr/unsupported/lib${kdelibsuff} \
/usr/athena/lib${kdelibsuff} \
/usr/local/x11r5/lib${kdelibsuff} \
/usr/lpp/Xamples/lib${kdelibsuff} \
/lib/usr/lib${kdelibsuff}/X11 \
/usr/lib${tdelibsuff} \
/usr/local/lib${tdelibsuff} \
/usr/unsupported/lib${tdelibsuff} \
/usr/athena/lib${tdelibsuff} \
/usr/local/x11r5/lib${tdelibsuff} \
/usr/lpp/Xamples/lib${tdelibsuff} \
/lib/usr/lib${tdelibsuff}/X11 \
\
/usr/openwin/lib${kdelibsuff} \
/usr/openwin/share/lib${kdelibsuff} \
/usr/openwin/lib${tdelibsuff} \
/usr/openwin/share/lib${tdelibsuff} \
; \
do
dnl Don't even attempt the hair of trying to link an X program!
@@ -881,24 +881,24 @@ m4trace:acinclude.m4:396: -1- AC_DEFUN([KDE_1_CHECK_PATHS], [
fi

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
AC_MSG_RESULT(yes)
else
AC_MSG_ERROR([your system fails at linking a small KDE application!
Check, if your compiler is installed correctly and if you have used the
same compiler to compile Qt and kdelibs as you did use now.
same compiler to compile Qt and tdelibs as you did use now.
For more details about this problem, look at the end of config.log.])
fi

if eval `KDEDIR= ./conftest 2>&5`; then
if eval `TDEDIR= ./conftest 2>&5`; then
kde_result=done
else
kde_result=problems
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_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], [
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"
if test -n "$KDEDIRS"; then
test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
if test -n "$TDEDIRS"; then
kde_save_IFS=$IFS
IFS=:
for dir in $KDEDIRS; do
for dir in $TDEDIRS; do
kde_default_bindirs="$dir/bin $kde_default_bindirs "
done
IFS=$kde_save_IFS
@@ -1098,18 +1098,18 @@ m4trace:acinclude.m4:641: -1- AC_DEFUN([KDE_SUBST_PROGRAMS], [
fi

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)])
fi
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)
fi
KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])

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"
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)
if test "$KDE_XSL_STYLESHEET" = "NO"; then
KDE_XSL_STYLESHEET=""
@@ -1202,7 +1202,7 @@ AC_SUBST(kde_templatesdir)
AC_SUBST(kde_servicesdir)
AC_SUBST(kde_servicetypesdir)
AC_SUBST(kde_moduledir)
AC_SUBST(kdeinitdir, '$(kde_moduledir)')
AC_SUBST(tdeinitdir, '$(kde_moduledir)')
AC_SUBST(kde_styledir)
AC_SUBST(kde_widgetdir)
if test "$kde_qtver" = 1; then
@@ -1420,7 +1420,7 @@ mips-sgi-irix6*)
ac_x_includes="."
fi
if test -z "$ac_x_libraries"; then
ac_x_libraries="/usr/lib${kdelibsuff}"
ac_x_libraries="/usr/lib${tdelibsuff}"
fi
esac
#from now on we use our own again
@@ -1794,7 +1794,7 @@ AC_ARG_ENABLE(
USING_QT_MT=""

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 ------------------------------------------------------------------------

KDE_MT_LDFLAGS=
@@ -1852,7 +1852,7 @@ dnl ------------------------------------------------------------
fi

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 ------------------------------------------------------------------------

if test "x$kde_use_qt_mt" = "xyes"; then
@@ -1887,7 +1887,7 @@ qt_includes=""
AC_ARG_WITH(qt-dir,
AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]),
[ ac_qt_includes="$withval"/include
ac_qt_libraries="$withval"/lib${kdelibsuff}
ac_qt_libraries="$withval"/lib${tdelibsuff}
ac_qt_bindir="$withval"/bin
])

@@ -1928,7 +1928,7 @@ ac_qt_includes="$qt_incdir"

qt_libdirs=""
for dir in $kde_qt_dirs; do
qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir"
qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir"
done
qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
if test ! "$ac_qt_libraries" = "NO"; then
@@ -2109,11 +2109,11 @@ rm -f actest.ui actest.cpp
AC_MSG_RESULT([$kde_cv_uic_plugins])
if test "$kde_cv_uic_plugins" != yes; then
AC_MSG_ERROR([
you need to install kdelibs first.
you need to install tdelibs first.

If you did install kdelibs, then the Qt version that is picked up by
this configure is not the same version you used to compile kdelibs.
The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the
If you did install tdelibs, then the Qt version that is picked up by
this configure is not the same version you used to compile tdelibs.
The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the
_same Qt version_, compiled with the _same compiler_ and the same Qt
configuration settings.
])
@@ -2232,16 +2232,16 @@ AC_CACHE_VAL(ac_cv_have_kde,

if test "$kde_qtver" = 1; then
kde_check_header="ksock.h"
kde_check_lib="libkdecore.la"
kde_check_lib="libtdecore.la"
else
kde_check_header="ksharedptr.h"
kde_check_lib="libkio.la"
kde_check_lib="libtdeio.la"
fi

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"
test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
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 "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs"
kde_incdirs="$ac_kde_includes $kde_incdirs"
AC_FIND_FILE($kde_check_header, $kde_incdirs, 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!])
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}"
test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/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 "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs"
kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
ac_kde_libraries="$kde_libdir"
@@ -2271,7 +2271,7 @@ fi
if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
AC_MSG_ERROR([
I can't find the designer plugins. These are required and should have been installed
by kdelibs])
by tdelibs])
fi

if test -n "$kde_widgetdir"; then
@@ -2286,7 +2286,7 @@ else
ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
fi

else dnl test -z $1, e.g. from kdelibs
else dnl test -z $1, e.g. from tdelibs

ac_cv_have_kde="have_kde=no"

@@ -2422,20 +2422,20 @@ cat > conftest.$ac_ext <<EOF
#include <kapp.h>

int main() {
printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data());
printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data());
printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data());
printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data());
printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data());
printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data());
printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data());
printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data());
printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data());
printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data());
printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
printf("kde_wallpaperdir=\\"%s\\"\n",
KApplication::kde_wallpaperdir().data());
printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data());
printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data());
TDEApplication::kde_wallpaperdir().data());
printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
printf("kde_moduledir=\\"/tmp/dummy\\"\n");
@@ -2471,7 +2471,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
kde_cxxflags_safe="$CXXFLAGS"

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"

AC_TRY_LINK([
@@ -2503,48 +2503,48 @@ m4trace:acinclude.m4:2110: -1- AC_DEFUN([KDE_CREATE_LIBS_ALIASES], [

if test $kde_qtver = 3; then
case $host in
*cygwin*) lib_kded="-lkdeinit_kded" ;;
*cygwin*) lib_kded="-ltdeinit_kded" ;;
*) lib_kded="" ;;
esac
AC_SUBST(LIB_KDED, $lib_kded)
AC_SUBST(LIB_KDECORE, "-lkdecore")
AC_SUBST(LIB_KDEUI, "-lkdeui")
AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lkabc")
AC_SUBST(LIB_KHTML, "-lkhtml")
AC_SUBST(LIB_KSPELL, "-lkspell")
AC_SUBST(LIB_KPARTS, "-lkparts")
AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
AC_SUBST(LIB_KUTILS, "-lkutils")
AC_SUBST(LIB_KDEPIM, "-lkdepim")
AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
AC_SUBST(LIB_KABC, "-ltdeabc")
AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-lkdnssd")
AC_SUBST(LIB_KUNITTEST, "-lkunittest")
AC_SUBST(LIB_TDEDNSSD, "-ltdednssd")
AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest")
# these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-lkio")
AC_SUBST(LIB_KFILE, "-lkio")
AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
AC_SUBST(LIB_KFILE, "-ltdeio")
elif test $kde_qtver = 2; then
AC_SUBST(LIB_KDECORE, "-lkdecore")
AC_SUBST(LIB_KDEUI, "-lkdeui")
AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-lksycoca")
AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-lkfile")
AC_SUBST(LIB_KFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-lkhtml")
AC_SUBST(LIB_KSPELL, "-lkspell")
AC_SUBST(LIB_KPARTS, "-lkparts")
AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else
AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
fi
])
m4trace:acinclude.m4:2134: -1- AC_DEFUN([AC_PATH_KDE], [
@@ -2604,7 +2604,7 @@ if test "x$kde_cv_func_$1" = xyes; then
else
case "$1" in
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
@@ -2888,7 +2888,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
AC_MSG_RESULT(yes)
AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
else
AC_MSG_ERROR(You need giflib30. Please install the kdesupport package)
AC_MSG_ERROR(You need giflib30. Please install the tdesupport package)
fi
])
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=

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 only warn
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)"
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)"
AC_SUBST(KDE_CHECK_PLUGIN)

@@ -3843,9 +3843,9 @@ m4trace:acinclude.m4:3536: -1- AC_DEFUN([KDE_CHECK_LIB64], [
AC_ARG_ENABLE(libsuffix,
AC_HELP_STRING([--enable-libsuffix],
[/lib directory suffix (64,32,none,auto[=default])]),
kdelibsuff=$enableval, kdelibsuff="auto")
tdelibsuff=$enableval, tdelibsuff="auto")
if test "$kdelibsuff" = "auto"; then
if test "$tdelibsuff" = "auto"; then
cat > conftest.c << EOF
#include <stdio.h>
@@ -3853,26 +3853,26 @@ int main() {
return 0;
}
EOF
kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
tdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
s,.*/lib\([[^\/]]*\)/.*,\1,
p
}'`
rm -rf conftest.*
fi
if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then
kdelibsuff=
if test "$tdelibsuff" = "no" || test "$tdelibsuff" = "none"; then
tdelibsuff=
fi
if test -z "$kdelibsuff"; then
if test -z "$tdelibsuff"; then
AC_MSG_RESULT([not using lib directory suffix])
AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories)
else
if test "$libdir" = '${exec_prefix}/lib'; then
libdir="$libdir${kdelibsuff}"
libdir="$libdir${tdelibsuff}"
AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms
fi
AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${kdelibsuff}"], Suffix for lib directories)
AC_MSG_RESULT([using lib directory suffix $kdelibsuff])
AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${tdelibsuff}"], Suffix for lib directories)
AC_MSG_RESULT([using lib directory suffix $tdelibsuff])
fi
])
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
AM_INIT_AUTOMAKE($1, $2)
AM_DISABLE_LIBRARIES
AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
AC_CHECK_COMPILERS
KDE_PROG_LIBTOOL
AM_KDE_WITH_NLS
@@ -4798,7 +4798,7 @@ fi

PYTHONINC=-I$python_incdir

python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs"
python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs"
AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir)
if test ! -r $python_libdir/libpython$version.so; then
AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)
@@ -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], [
unset CDPATH
dnl make $KDEDIR the default for the installation
AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
dnl make $TDEDIR the default for the installation
AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})

if test "x$prefix" = "xNONE"; then
prefix=$ac_default_prefix
@@ -5174,25 +5174,25 @@ m4trace:acinclude.m4:5024: -1- AC_DEFUN([KDE_SET_PREFIX], [
unset CDPATH
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.
AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix})
AC_PREFIX_DEFAULT(${TDEDIR:-the kde prefix})

KDE_SET_DEFAULT_BINDIRS
if test "x$prefix" = "xNONE"; then
dnl no prefix given: look for kde-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)
dnl no prefix given: look for tde-config in the PATH and deduce the prefix from it
KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend)
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"
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"
fi

kde_libs_prefix=`$KDECONFIG --prefix`
if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs.
AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs.
This means it has been moved since you installed it.
This won't work. Please recompile kdelibs for the new prefix.
This won't work. Please recompile tdelibs for the new prefix.
])
fi
kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
@@ -5200,7 +5200,7 @@ m4trace:acinclude.m4:5024: -1- AC_DEFUN([KDE_SET_PREFIX], [
AC_MSG_CHECKING([where to install])
if test "x$prefix" = "xNONE"; then
prefix=$kde_libs_prefix
AC_MSG_RESULT([$prefix (as returned by kde-config)])
AC_MSG_RESULT([$prefix (as returned by tde-config)])
else
dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different
given_prefix=$prefix
@@ -5741,7 +5741,7 @@ ssl_includes=""
AC_ARG_WITH(ssl-dir,
AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]),
[ ac_ssl_includes="$withval"/include
ac_ssl_libraries="$withval"/lib$kdelibsuff
ac_ssl_libraries="$withval"/lib$tdelibsuff
])

want_ssl=yes
@@ -5761,7 +5761,7 @@ AC_CACHE_VAL(ac_cv_have_ssl,
AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir)
ac_ssl_includes="$ssl_incdir"

ssl_libdirs="/usr/lib$kdelibsuff /usr/local/lib$kdelibsuff /usr/ssl/lib$kdelibsuff /usr/local/ssl/lib$kdelibsuff $libdir $prefix/lib$kdelibsuff $exec_prefix/lib$kdelibsuff $kde_extra_libs"
ssl_libdirs="/usr/lib$tdelibsuff /usr/local/lib$tdelibsuff /usr/ssl/lib$tdelibsuff /usr/local/ssl/lib$tdelibsuff $libdir $prefix/lib$tdelibsuff $exec_prefix/lib$tdelibsuff $kde_extra_libs"
if test ! "$ac_ssl_libraries" = "NO"; then
ssl_libdirs="$ac_ssl_libraries $ssl_libdirs"
fi
@@ -5982,9 +5982,9 @@ fi
])
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
PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
PKG_CONFIG_PATH="$kde_libs_prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
fi
export PKG_CONFIG_PATH
PKG_CHECK_MODULES([$1],[$2],[$3],[$4])
@@ -10033,7 +10033,7 @@ EOF
# Now try to grab the symbols.
nlist=conftest.nm
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
mv -f "$nlist"T "$nlist"
else
@@ -11592,10 +11592,10 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
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_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_MISSING_PROG_ERROR([kde-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_MISSING_PROG_ERROR([kde-config])
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([tde-config])
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([tde-config])
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_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_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([kconfig_compiler], [KCONFIG_COMPILER], [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
m4trace:configure.in:61: -1- 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([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_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_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([maketdewidgets])
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- 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_servicetypesdir$])
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_widgetdir$])
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_KDECORE$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDEUI$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KIO$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDECORE$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEUI$])
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_SMB$])
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_KHTML$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KSPELL$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KPARTS$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDEPRINT$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KUTILS$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDEPIM$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KIMPROXY$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEHTML$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDESPELL$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEPARTS$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEPRINT$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEUTILS$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEPIM$])
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_KDNSSD$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KUNITTEST$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KSYCOCA$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEDNSSD$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEUNITTEST$])
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_KDECORE$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDEUI$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KIO$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KSYCOCA$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDECORE$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEUI$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEIO$])
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_KFILE$])
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_KSPELL$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KPARTS$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDEPRINT$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDECORE$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDEUI$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEHTML$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDESPELL$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEPARTS$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEPRINT$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDECORE$])
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_KFILE$])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KAB$])


+ 78
- 78
autom4te.cache/traces.1 View File

@@ -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_TRACE([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_TRACE([kdeinitdir])
m4trace:configure.in:61: -1- m4_pattern_allow([^kdeinitdir$])
m4trace:configure.in:61: -1- AC_SUBST([tdeinitdir], ['$(kde_moduledir)'])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([tdeinitdir])
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_TRACE([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_TRACE([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_TRACE([LIB_KDECORE])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDECORE$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KDEUI], ["-lkdeui"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KDEUI])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDEUI$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KIO], ["-lkio"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KIO])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KIO$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_TDECORE], ["-ltdecore"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDECORE])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDECORE$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEUI], ["-ltdeui"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDEUI])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEUI$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEIO], ["-ltdeio"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDEIO])
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_TRACE([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_TRACE([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- m4_pattern_allow([^LIB_KABC$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KHTML], ["-lkhtml"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KHTML])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KHTML$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KSPELL], ["-lkspell"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KSPELL])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KSPELL$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KPARTS], ["-lkparts"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KPARTS])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KPARTS$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KDEPRINT], ["-lkdeprint"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KDEPRINT])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDEPRINT$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KUTILS], ["-lkutils"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KUTILS])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KUTILS$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KDEPIM], ["-lkdepim"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KDEPIM])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDEPIM$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KIMPROXY], ["-lkimproxy"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KIMPROXY])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KIMPROXY$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEHTML], ["-ltdehtml"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDEHTML])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEHTML$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_TDESPELL], ["-ltdespell"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDESPELL])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDESPELL$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEPARTS], ["-ltdeparts"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDEPARTS])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEPARTS$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEPRINT], ["-ltdeprint"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDEPRINT])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEPRINT$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEUTILS], ["-ltdeutils"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDEUTILS])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEUTILS$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEPIM], ["-ltdepim"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDEPIM])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEPIM$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEIMPROXY], ["-ltdeimproxy"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDEIMPROXY])
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_TRACE([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_TRACE([LIB_KDNSSD])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDNSSD$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KUNITTEST], ["-lkunittest"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KUNITTEST])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KUNITTEST$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KSYCOCA], ["-lkio"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KSYCOCA])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KSYCOCA$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KFILE], ["-lkio"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEDNSSD], ["-ltdednssd"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDEDNSSD])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEDNSSD$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEUNITTEST], ["-ltdeunittest"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDEUNITTEST])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEUNITTEST$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_TDESYCOCA], ["-ltdeio"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDESYCOCA])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDESYCOCA$])
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- m4_pattern_allow([^LIB_KFILE$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KDECORE], ["-lkdecore"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KDECORE])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDECORE$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KDEUI], ["-lkdeui"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KDEUI])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDEUI$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KIO], ["-lkio"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KIO])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KIO$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KSYCOCA], ["-lksycoca"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KSYCOCA])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KSYCOCA$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_TDECORE], ["-ltdecore"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDECORE])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDECORE$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEUI], ["-ltdeui"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDEUI])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEUI$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEIO], ["-ltdeio"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDEIO])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEIO$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_TDESYCOCA], ["-ltdesycoca"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDESYCOCA])
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_TRACE([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- m4_pattern_allow([^LIB_KFILE$])
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- m4_pattern_allow([^LIB_KAB$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KHTML], ["-lkhtml"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KHTML])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KHTML$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KSPELL], ["-lkspell"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KSPELL])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KSPELL$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KPARTS], ["-lkparts"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KPARTS])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KPARTS$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KDEPRINT], ["-lkdeprint"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KDEPRINT])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDEPRINT$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KDECORE], ["-lkdecore -lXext $(LIB_QT)"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KDECORE])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDECORE$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KDEUI], ["-lkdeui $(LIB_KDECORE)"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_KDEUI])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_KDEUI$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_KFM], ["-lkfm $(LIB_KDECORE)"])
m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEHTML], ["-ltdehtml"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDEHTML])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEHTML$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_TDESPELL], ["-ltdespell"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDESPELL])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDESPELL$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEPARTS], ["-ltdeparts"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDEPARTS])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEPARTS$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEPRINT], ["-ltdeprint"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDEPRINT])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEPRINT$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_TDECORE], ["-ltdecore -lXext $(LIB_QT)"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDECORE])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDECORE$])
m4trace:configure.in:61: -1- AC_SUBST([LIB_TDEUI], ["-ltdeui $(LIB_TDECORE)"])
m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB_TDEUI])
m4trace:configure.in:61: -1- m4_pattern_allow([^LIB_TDEUI$])
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- 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- 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- m4_pattern_allow([^LIB_KAB$])
m4trace:configure.in:69: -1- AC_DEFINE_TRACE_LITERAL([WORDS_BIGENDIAN])


+ 9
- 9
doc/en/index.docbook View File

@@ -2,7 +2,7 @@
<!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 kappname "&find;"><!-- Do *not* replace kappname-->
<!ENTITY package "kde-module"><!-- kdebase, kdeadmin, etc -->
<!ENTITY package "kde-module"><!-- tdebase, tdeadmin, etc -->
<!ENTITY % addindex "IGNORE">
<!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>
The Squiggle Tool <guiicon><inlinemediaobject>
The Stquiggle Tool <guiicon><inlinemediaobject>
<imageobject>
<imagedata fileref="squiggle.png" format="PNG"/>
<imagedata fileref="stquiggle.png" format="PNG"/>
</imageobject>
<imageobject>
<imagedata fileref="squiggle.eps" format="EPS"/>
<imagedata fileref="stquiggle.eps" format="EPS"/>
</imageobject>
<textobject>
<phrase>Squiggle</phrase>
<phrase>Stquiggle</phrase>
</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!
</para>

@@ -441,7 +441,7 @@ Program copyright 2007 Andreas Eckstein <email>andreas.eckstein@gmx.net</email>
<para>
Contributors:
<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><para>Tux the Linux Penguin <email>tux@linux.org</email></para>
</listitem>
@@ -488,8 +488,8 @@ application -->

<!--
List any special requirements for your application here. This should include:
.Libraries or other software that is not included in kdesupport,
kdelibs, or kdebase.
.Libraries or other software that is not included in tdesupport,
tdelibs, or tdebase.
.Hardware requirements like amount of RAM, disk space, graphics card
capabilities, screen resolution, special expansion cards, etc.
.Operating systems the app will run on. If your app is designed only for a


+ 5
- 5
src/Makefile.am View File

@@ -1,15 +1,15 @@
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
kio_find_la_LIBADD = -lkio
kio_find_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN)
tdeio_find_la_SOURCES = find.cpp findimpl.cpp findurl.cpp trackerfindclient.cpp
tdeio_find_la_LIBADD = -ltdeio
tdeio_find_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN)

protocol_DATA = find.protocol
protocoldir = $(kde_servicesdir)

messages: 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

+ 25
- 25
src/find.cpp View File

@@ -19,56 +19,56 @@
***************************************************************************/

#include <kdebug.h>
#include <klocale.h>
#include <kapplication.h>
#include <tdelocale.h>
#include <tdeapplication.h>
#include <dcopclient.h>
#include <kcmdlineargs.h>
#include <kglobal.h>
#include <tdecmdlineargs.h>
#include <tdeglobal.h>

#include "findurl.h"
#include "find.h"

static const KCmdLineOptions options[] =
static const TDECmdLineOptions options[] =
{
{ "+protocol", I18N_NOOP( "Protocol name" ), 0 },
{ "+pool", I18N_NOOP( "Socket name" ), 0 },
{ "+app", I18N_NOOP( "Socket name" ), 0 },
KCmdLineLastOption
TDECmdLineLastOption
};

extern "C" {
int KDE_EXPORT kdemain( int argc, char **argv )
{
putenv(strdup("SESSION_MANAGER="));
KCmdLineArgs::init(argc, argv, "kio_find", 0, 0, 0, 0);
KCmdLineArgs::addCmdLineOptions( options );
KApplication app( false, false );
TDECmdLineArgs::init(argc, argv, "tdeio_find", 0, 0, 0, 0);
TDECmdLineArgs::addCmdLineOptions( options );
TDEApplication app( false, false );
app.dcopClient()->attach();

KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
kio_findProtocol slave( args->arg(0), args->arg(1), args->arg(2) );
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
tdeio_findProtocol slave( args->arg(0), args->arg(1), args->arg(2) );
slave.dispatchLoop();
return 0;
}
}

kio_findProtocol::kio_findProtocol(const QCString &protocol,
const QCString &pool, const QCString &app)
tdeio_findProtocol::tdeio_findProtocol(const TQCString &protocol,
const TQCString &pool, const TQCString &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);

if(furl.isMalformed())
{
malformedError(url, QString("listDir"), furl);
malformedError(url, TQString("listDir"), furl);
return;
}

@@ -79,8 +79,8 @@ void kio_findProtocol::listDir(const KURL &url)
return;
}

KIO::UDSEntry entry;
KIO::UDSEntryList result_list;
TDEIO::UDSEntry entry;
TDEIO::UDSEntryList result_list;
if(furl.hasSearch())
{
@@ -105,13 +105,13 @@ void kio_findProtocol::listDir(const KURL &url)
return;
}

void kio_findProtocol::stat(const KURL &url)
void tdeio_findProtocol::stat(const KURL &url)
{
FindURL furl(url);

if (furl.isMalformed())
{
malformedError(url, QString("rewriteURL"), furl);
malformedError(url, TQString("rewriteURL"), furl);
return;
}

@@ -124,23 +124,23 @@ void kio_findProtocol::stat(const KURL &url)

if(!furl.hasSearch())
{
KIO::UDSEntry entry;
TDEIO::UDSEntry entry;
m_impl.createTopLevelEntry(entry);
statEntry(entry);
finished();
return;
}

KIO::UDSEntry entry;
TDEIO::UDSEntry entry;
m_impl.createSearchSecondLevelEntry(entry , furl.search());
statEntry(entry);
finished();
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);
}

+ 7
- 7
src/find.h View File

@@ -18,22 +18,22 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/

#ifndef KIO_FIND_H
#define KIO_FIND_H
#ifndef TDEIO_FIND_H
#define TDEIO_FIND_H

#include <kio/forwardingslavebase.h>
#include <tdeio/forwardingslavebase.h>
#include "findimpl.h"

class kio_findProtocol : public KIO::SlaveBase
class tdeio_findProtocol : public TDEIO::SlaveBase
{
public:
kio_findProtocol(const QCString &protocol, const QCString &pool, const QCString &app);
virtual ~kio_findProtocol();
tdeio_findProtocol(const TQCString &protocol, const TQCString &pool, const TQCString &app);
virtual ~tdeio_findProtocol();
virtual void listDir(const KURL &url);
virtual void stat(const KURL &url);
private:
void malformedError(const KURL& url, QString func, FindURL& furl);
void malformedError(const KURL& url, TQString func, FindURL& furl);
FindImpl m_impl;
};


+ 2
- 2
src/find.protocol View File

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

+ 47
- 47
src/findimpl.cpp View File

@@ -22,16 +22,16 @@

#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)
{
if(!url.hasFilter())
return;

QString filter = url.filter().replace('.', "\\.");
TQString filter = url.filter().replace('.', "\\.");
filter = filter.replace('*', "[^\\/]*") + "$";
QRegExp re(filter, false);
TQRegExp re(filter, false);
ResultListIterator iter = ResultListIterator(list);

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_long = l;
atom.m_str = s;
@@ -54,25 +54,25 @@ static void addAtom(KIO::UDSEntry &entry, unsigned int ID, long l, const QString

FindImpl::FindImpl()
{
history_dir.setPath(QDir::homeDirPath() + "/" + history_dir_name);
history_dir.setPath(TQDir::homeDirPath() + "/" + history_dir_name);
}

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(!QDir::home().mkdir(history_dir_name))
if(!TQDir::home().mkdir(history_dir_name))
return;

if(_history_file.open(IO_WriteOnly|IO_Append))
{
QTextStream stream(&_history_file);
TQTextStream stream(&_history_file);
_history_file.close();
}
}

void FindImpl::parseHistory(QValueList<KIO::UDSEntry> &list)
void FindImpl::parseHistory(TQValueList<TDEIO::UDSEntry> &list)
{
history_dir.refresh();

@@ -82,8 +82,8 @@ void FindImpl::parseHistory(QValueList<KIO::UDSEntry> &list)
if(history_dir.count()==0)
return;

QFileInfoListIterator it(*history_dir.entryInfoList());
QFileInfo *info;
TQFileInfoListIterator it(*history_dir.entryInfoList());
TQFileInfo *info;

while(it.current() != NULL)
{
@@ -91,15 +91,15 @@ void FindImpl::parseHistory(QValueList<KIO::UDSEntry> &list)
if(info->isFile())
{
FindURL url(info->baseName().replace('_', "/"));
KIO::UDSEntry entry;
addAtom(entry, KIO::UDS_URL, 0, url.prettyURL());
addAtom(entry, KIO::UDS_NAME, 0, url.search());
addAtom(entry, KIO::UDS_FILE_TYPE, S_IFDIR);
addAtom(entry, KIO::UDS_MODIFICATION_TIME, info->lastModified().toTime_t(), QString::null);
addAtom(entry, KIO::UDS_ACCESS_TIME, info->lastRead().toTime_t(), QString::null);
addAtom(entry, KIO::UDS_CREATION_TIME, info->created().toTime_t(), QString::null);
addAtom(entry, KIO::UDS_MIME_TYPE, 0, "inode/directory");
addAtom(entry, KIO::UDS_ICON_NAME, 0, getIcon(url));
TDEIO::UDSEntry entry;
addAtom(entry, TDEIO::UDS_URL, 0, url.prettyURL());
addAtom(entry, TDEIO::UDS_NAME, 0, url.search());
addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFDIR);
addAtom(entry, TDEIO::UDS_MODIFICATION_TIME, info->lastModified().toTime_t(), TQString::null);
addAtom(entry, TDEIO::UDS_ACCESS_TIME, info->lastRead().toTime_t(), TQString::null);
addAtom(entry, TDEIO::UDS_CREATION_TIME, info->created().toTime_t(), TQString::null);
addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, "inode/directory");
addAtom(entry, TDEIO::UDS_ICON_NAME, 0, getIcon(url));
list.append(entry);
}
@@ -107,7 +107,7 @@ void FindImpl::parseHistory(QValueList<KIO::UDSEntry> &list)
}
}