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

Additional KDE3 => TDE conversion

Browse Source
pull/1/head
Slávek Banko 12 years ago
parent e6526a85a4
commit 1e415aa71b
18 changed files with 305 additions and 305 deletions
Show Stats Download Patch File Download Diff File

4
ChangeLog
Unescape View File

@ -3,7 +3,7 @@ KSensors-0.7.3
* Fixed too much decimal digits in sensor values * Fixed too much decimal digits in sensor values
* Fixed lock and 100% cpu usage when using hddtemp sensor * Fixed lock and 100% cpu usage when using hddtemp sensor
* Ported to kdevelop 3 project and improved config dialog appearance (by Thomas Nagy <>) * Ported to tdevelop 3 project and improved config dialog appearance (by Thomas Nagy <>)
* Fix to support adm1025 chip (patch from Jose Luis Martin) <josel.m@terra.com>) * Fix to support adm1025 chip (patch from Jose Luis Martin) <josel.m@terra.com>)
* CPU speed panel updated in realtime, usefull in mobile processors ( code from Stefan Gunkler <stegun@yahoo.com> ) * CPU speed panel updated in realtime, usefull in mobile processors ( code from Stefan Gunkler <stegun@yahoo.com> )
* Added support for reading cpu temperature from /proc/acpi/thermal_zone/THRM/temperature * Added support for reading cpu temperature from /proc/acpi/thermal_zone/THRM/temperature
@ -45,7 +45,7 @@ KSensors-0.6.1
* Bug Fix release: * Bug Fix release:
Fixed a problem executing hddtemp to monitor harddisks temperatures. Fixed a problem executing hddtemp to monitor harddisks temperatures.
(After 1000 executions KProcess object don't emit Exited signal and cpu usage jumps to 100%, (After 1000 executions TDEProcess object don't emit Exited signal and cpu usage jumps to 100%,
resolved creating and destroying kprocess every time is need) resolved creating and destroying kprocess every time is need)
KSensors-0.6 KSensors-0.6

2
Doxyfile
Unescape View File

@ -3,7 +3,7 @@
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# Project related configuration options # Project related configuration options
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
PROJECT_NAME = ksensors.kdevelop PROJECT_NAME = ksensors.tdevelop
PROJECT_NUMBER = 0.7.3 PROJECT_NUMBER = 0.7.3
OUTPUT_DIRECTORY = OUTPUT_DIRECTORY =
OUTPUT_LANGUAGE = English OUTPUT_LANGUAGE = English

12
Makefile.in
Unescape View File

@ -151,12 +151,12 @@ LIBZ = @LIBZ@
LIB_JASPER = @LIB_JASPER@ LIB_JASPER = @LIB_JASPER@
LIB_KAB = @LIB_KAB@ LIB_KAB = @LIB_KAB@
LIB_KABC = @LIB_KABC@ LIB_KABC = @LIB_KABC@
LIB_KDECORE = @LIB_KDECORE@ LIB_TDECORE = @LIB_TDECORE@
LIB_KDEPRINT = @LIB_KDEPRINT@ LIB_TDEPRINT = @LIB_TDEPRINT@
LIB_KDEUI = @LIB_KDEUI@ LIB_TDEUI = @LIB_TDEUI@
LIB_KFILE = @LIB_KFILE@ LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@ LIB_KFM = @LIB_KFM@
LIB_KHTML = @LIB_KHTML@ LIB_TDEHTML = @LIB_TDEHTML@
LIB_KIMGIO = @LIB_KIMGIO@ LIB_KIMGIO = @LIB_KIMGIO@
LIB_KIO = @LIB_KIO@ LIB_KIO = @LIB_KIO@
LIB_KPARTS = @LIB_KPARTS@ LIB_KPARTS = @LIB_KPARTS@
@ -245,7 +245,7 @@ kde_styledir = @kde_styledir@
kde_templatesdir = @kde_templatesdir@ kde_templatesdir = @kde_templatesdir@
kde_wallpaperdir = @kde_wallpaperdir@ kde_wallpaperdir = @kde_wallpaperdir@
kde_widgetdir = @kde_widgetdir@ kde_widgetdir = @kde_widgetdir@
kdeinitdir = @kdeinitdir@ tdeinitdir = @tdeinitdir@
micodir = @micodir@ micodir = @micodir@
qt_includes = @qt_includes@ qt_includes = @qt_includes@
qt_libraries = @qt_libraries@ qt_libraries = @qt_libraries@
@ -653,7 +653,7 @@ dist-hook:
#>+ 2 #>+ 2
KDE_DIST=stamp-h.in LIESMICH subdirs ksensors.kdevelop FAQ LISEZMOI ksensors.kdevelop.pcs configure.files ksensors.kdevses build-stamp LEEME Doxyfile KDE_DIST=stamp-h.in LIESMICH subdirs ksensors.tdevelop FAQ LISEZMOI ksensors.tdevelop.pcs configure.files ksensors.kdevses build-stamp LEEME Doxyfile
#>+ 2 #>+ 2
docs-am: docs-am:

230
acinclude.m4
Unescape View File

@ -23,8 +23,8 @@ dnl IMPORTANT NOTE:
dnl Please do not modify this file unless you expect your modifications to be dnl Please do not modify this file unless you expect your modifications to be
dnl carried into every other module in the repository. dnl carried into every other module in the repository.
dnl dnl
dnl Single-module modifications are best placed in configure.in for kdelibs dnl Single-module modifications are best placed in configure.in for tdelibs
dnl and kdebase or configure.in.in if present. dnl and tdebase or configure.in.in if present.
# KDE_PATH_X_DIRECT # KDE_PATH_X_DIRECT
dnl Internal subroutine of AC_PATH_X. dnl Internal subroutine of AC_PATH_X.
@ -103,41 +103,41 @@ ac_x_libraries=],
[LIBS="$ac_save_LIBS" [LIBS="$ac_save_LIBS"
# First see if replacing the include by lib works. # First see if replacing the include by lib works.
# Check X11 before X11Rn because it is often a symlink to the current release. # Check X11 before X11Rn because it is often a symlink to the current release.
for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \ for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \
/usr/X11/lib${kdelibsuff} \ /usr/X11/lib${tdelibsuff} \
/usr/X11R6/lib${kdelibsuff} \ /usr/X11R6/lib${tdelibsuff} \
/usr/X11R5/lib${kdelibsuff} \ /usr/X11R5/lib${tdelibsuff} \
/usr/X11R4/lib${kdelibsuff} \ /usr/X11R4/lib${tdelibsuff} \
\ \
/usr/lib${kdelibsuff}/X11 \ /usr/lib${tdelibsuff}/X11 \
/usr/lib${kdelibsuff}/X11R6 \ /usr/lib${tdelibsuff}/X11R6 \
/usr/lib${kdelibsuff}/X11R5 \ /usr/lib${tdelibsuff}/X11R5 \
/usr/lib${kdelibsuff}/X11R4 \ /usr/lib${tdelibsuff}/X11R4 \
\ \
/usr/local/X11/lib${kdelibsuff} \ /usr/local/X11/lib${tdelibsuff} \
/usr/local/X11R6/lib${kdelibsuff} \ /usr/local/X11R6/lib${tdelibsuff} \
/usr/local/X11R5/lib${kdelibsuff} \ /usr/local/X11R5/lib${tdelibsuff} \
/usr/local/X11R4/lib${kdelibsuff} \ /usr/local/X11R4/lib${tdelibsuff} \
\ \
/usr/local/lib${kdelibsuff}/X11 \ /usr/local/lib${tdelibsuff}/X11 \
/usr/local/lib${kdelibsuff}/X11R6 \ /usr/local/lib${tdelibsuff}/X11R6 \
/usr/local/lib${kdelibsuff}/X11R5 \ /usr/local/lib${tdelibsuff}/X11R5 \
/usr/local/lib${kdelibsuff}/X11R4 \ /usr/local/lib${tdelibsuff}/X11R4 \
\ \
/usr/X386/lib${kdelibsuff} \ /usr/X386/lib${tdelibsuff} \
/usr/x386/lib${kdelibsuff} \ /usr/x386/lib${tdelibsuff} \
/usr/XFree86/lib${kdelibsuff}/X11 \ /usr/XFree86/lib${tdelibsuff}/X11 \
\ \
/usr/lib${kdelibsuff} \ /usr/lib${tdelibsuff} \
/usr/local/lib${kdelibsuff} \ /usr/local/lib${tdelibsuff} \
/usr/unsupported/lib${kdelibsuff} \ /usr/unsupported/lib${tdelibsuff} \
/usr/athena/lib${kdelibsuff} \ /usr/athena/lib${tdelibsuff} \
/usr/local/x11r5/lib${kdelibsuff} \ /usr/local/x11r5/lib${tdelibsuff} \
/usr/lpp/Xamples/lib${kdelibsuff} \ /usr/lpp/Xamples/lib${tdelibsuff} \
/lib/usr/lib${kdelibsuff}/X11 \ /lib/usr/lib${tdelibsuff}/X11 \
\ \
/usr/openwin/lib${kdelibsuff} \ /usr/openwin/lib${tdelibsuff} \
/usr/openwin/share/lib${kdelibsuff} \ /usr/openwin/share/lib${tdelibsuff} \
; \ ; \
do do
dnl Don't even attempt the hair of trying to link an X program! dnl Don't even attempt the hair of trying to link an X program!
@ -356,24 +356,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)
@ -529,11 +529,11 @@ AC_DEFUN(KDE_SUBST_PROGRAMS,
AM_CONDITIONAL(include_ARTS, test "$build_arts" != "no") AM_CONDITIONAL(include_ARTS, test "$build_arts" != "no")
kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin" kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs" test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
if test -n "$KDEDIRS"; then if test -n "$TDEDIRS"; then
kde_save_IFS=$IFS kde_save_IFS=$IFS
IFS=: IFS=:
for dir in $KDEDIRS; do for dir in $TDEDIRS; do
kde_default_bindirs="$dir/bin $kde_default_bindirs " kde_default_bindirs="$dir/bin $kde_default_bindirs "
done done
IFS=$kde_save_IFS IFS=$kde_save_IFS
@ -545,12 +545,12 @@ AC_DEFUN(KDE_SUBST_PROGRAMS,
KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)]) KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)])
KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)]) KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)])
fi fi
KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs]) KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs])
KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs]) KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then
kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share" kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs" test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs"
AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET) AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
if test "$KDE_XSL_STYLESHEET" = "NO"; then if test "$KDE_XSL_STYLESHEET" = "NO"; then
KDE_XSL_STYLESHEET="" KDE_XSL_STYLESHEET=""
@ -573,9 +573,9 @@ AC_DEFUN(KDE_SUBST_PROGRAMS,
if test -x "$KDECONFIG"; then # it can be "compiled" if test -x "$KDECONFIG"; then # it can be "compiled"
kde_libs_prefix=`$KDECONFIG --prefix` kde_libs_prefix=`$KDECONFIG --prefix`
if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs. AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs.
This means it has been moved since you installed it. This means it has been moved since you installed it.
This won't work. Please recompile kdelibs for the new prefix. This won't work. Please recompile tdelibs for the new prefix.
]) ])
fi fi
kde_libs_htmldir=`$KDECONFIG --install html --expandvars` kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
@ -655,7 +655,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
@ -875,7 +875,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
@ -1355,7 +1355,7 @@ qt_includes=""
AC_ARG_WITH(qt-dir, AC_ARG_WITH(qt-dir,
[ --with-qt-dir=DIR where the root of Qt is installed ], [ --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
]) ])
@ -1396,7 +1396,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
@ -1577,7 +1577,7 @@ rm -f actest.ui actest.cpp
AC_MSG_RESULT([$kde_cv_uic_plugins]) AC_MSG_RESULT([$kde_cv_uic_plugins])
if test "$kde_cv_uic_plugins" != yes; then if test "$kde_cv_uic_plugins" != yes; then
AC_MSG_ERROR([you need to install kdelibs first.]) AC_MSG_ERROR([you need to install tdelibs first.])
fi fi
fi fi
]) ])
@ -1661,12 +1661,12 @@ if test "${prefix}" != NONE; then
if test "${exec_prefix}" != NONE; then if test "${exec_prefix}" != NONE; then
kde_libraries=${libdir} kde_libraries=${libdir}
ac_kde_libraries=$libdir ac_kde_libraries=$libdir
if test "$ac_kde_libraries" = '${exec_prefix}/lib'${kdelibsuff}; then if test "$ac_kde_libraries" = '${exec_prefix}/lib'${tdelibsuff}; then
ac_kde_libraries=$exec_prefix/lib${kdelibsuff} ac_kde_libraries=$exec_prefix/lib${tdelibsuff}
fi fi
else else
kde_libraries=${prefix}/lib${kdelibsuff} kde_libraries=${prefix}/lib${tdelibsuff}
ac_kde_libraries=$prefix/lib${kdelibsuff} ac_kde_libraries=$prefix/lib${tdelibsuff}
fi fi
else else
ac_kde_includes= ac_kde_includes=
@ -1680,16 +1680,16 @@ AC_CACHE_VAL(ac_cv_have_kde,
if test "$kde_qtver" = 1; then if test "$kde_qtver" = 1; then
kde_check_header="ksock.h" kde_check_header="ksock.h"
kde_check_lib="libkdecore.la" kde_check_lib="libtdecore.la"
else else
kde_check_header="ksharedptr.h" kde_check_header="ksharedptr.h"
kde_check_lib="libkio.la" kde_check_lib="libtdeio.la"
fi fi
if test -z "$1"; then if test -z "$1"; then
kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs" test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs"
kde_incdirs="$ac_kde_includes $kde_incdirs" kde_incdirs="$ac_kde_includes $kde_incdirs"
AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir) AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
ac_kde_includes="$kde_incdir" ac_kde_includes="$kde_incdir"
@ -1700,8 +1700,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="/usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" kde_libdirs="/usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}"
test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs" test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs"
kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir) AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
ac_kde_libraries="$kde_libdir" ac_kde_libraries="$kde_libdir"
@ -1719,7 +1719,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
@ -1875,20 +1875,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");
@ -1922,7 +1922,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([
@ -1986,37 +1986,37 @@ AC_DEFUN(KDE_CREATE_LIBS_ALIASES,
AC_REQUIRE([K_PATH_X]) AC_REQUIRE([K_PATH_X])
if test $kde_qtver = 3; then if test $kde_qtver = 3; then
AC_SUBST(LIB_KDECORE, "-lkdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_KDEUI, "-lkdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KIO, "-ltdeio")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lkabc") AC_SUBST(LIB_KABC, "-ltdeabc")
AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_KDEPRINT, "-lkdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
# these are for backward compatibility # these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-lkio") AC_SUBST(LIB_KSYCOCA, "-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_KIO, "-ltdeio")
AC_SUBST(LIB_KSYCOCA, "-lksycoca") AC_SUBST(LIB_KSYCOCA, "-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_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_KPARTS, "-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
]) ])
@ -2081,7 +2081,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
@ -2357,7 +2357,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
]) ])
@ -2422,7 +2422,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
@ -3044,26 +3044,26 @@ See http:://objprelink.sourceforge.net for details:
AC_DEFUN(KDE_CHECK_LIB64, AC_DEFUN(KDE_CHECK_LIB64,
[ [
kdelibsuff=none tdelibsuff=none
AC_ARG_ENABLE(libsuffix, AC_ARG_ENABLE(libsuffix,
AC_HELP_STRING([--enable-libsuffix], AC_HELP_STRING([--enable-libsuffix],
[/lib directory suffix (64,32,none[=default])]), [/lib directory suffix (64,32,none[=default])]),
kdelibsuff=$enableval) tdelibsuff=$enableval)
# TODO: add an auto case that compiles a little C app to check # TODO: add an auto case that compiles a little C app to check
# where the glibc is # where the glibc is
if test "$kdelibsuff" = "none"; then if 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
]) ])
@ -3079,7 +3079,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
@ -4647,8 +4647,8 @@ AC_DEFUN(KDE_CONF_FILES,
AC_DEFUN(KDE_SET_PREFIX, AC_DEFUN(KDE_SET_PREFIX,
[ [
unset CDPATH unset CDPATH
dnl make $KDEDIR the default for the installation dnl make $TDEDIR the default for the installation
AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
if test "x$prefix" = "xNONE"; then if test "x$prefix" = "xNONE"; then
prefix=$ac_default_prefix prefix=$ac_default_prefix
@ -4727,15 +4727,15 @@ pushdef([AC_PROG_INSTALL],
fi fi
])dnl ])dnl
AC_DEFUN(KDE_LANG_CPLUSPLUS, AC_DEFUN(TDE_LANG_CPLUSPLUS,
[AC_LANG_CPLUSPLUS [AC_LANG_CPLUSPLUS
ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AC_FD_CC' ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AC_FD_CC'
pushdef([AC_LANG_CPLUSPLUS], [popdef([AC_LANG_CPLUSPLUS]) KDE_LANG_CPLUSPLUS]) pushdef([AC_LANG_CPLUSPLUS], [popdef([AC_LANG_CPLUSPLUS]) TDE_LANG_CPLUSPLUS])
]) ])
pushdef([AC_LANG_CPLUSPLUS], pushdef([AC_LANG_CPLUSPLUS],
[popdef([AC_LANG_CPLUSPLUS]) [popdef([AC_LANG_CPLUSPLUS])
KDE_LANG_CPLUSPLUS TDE_LANG_CPLUSPLUS
]) ])
AC_DEFUN(KDE_CHECK_LONG_LONG, AC_DEFUN(KDE_CHECK_LONG_LONG,
@ -5262,7 +5262,7 @@ ssl_includes=""
AC_ARG_WITH(ssl-dir, AC_ARG_WITH(ssl-dir,
[ --with-ssl-dir=DIR where the root of OpenSSL is installed], [ --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
@ -5282,7 +5282,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

230
aclocal.m4 vendored
Unescape View File

@ -35,8 +35,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.
@ -115,41 +115,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!
@ -368,24 +368,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)
@ -541,11 +541,11 @@ AC_DEFUN(KDE_SUBST_PROGRAMS,
AM_CONDITIONAL(include_ARTS, test "$build_arts" != "no") AM_CONDITIONAL(include_ARTS, test "$build_arts" != "no")
kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin" kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs" test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
if test -n "$KDEDIRS"; then if test -n "$TDEDIRS"; then
kde_save_IFS=$IFS kde_save_IFS=$IFS
IFS=: IFS=:
for dir in $KDEDIRS; do for dir in $TDEDIRS; do
kde_default_bindirs="$dir/bin $kde_default_bindirs " kde_default_bindirs="$dir/bin $kde_default_bindirs "
done done
IFS=$kde_save_IFS IFS=$kde_save_IFS
@ -557,12 +557,12 @@ AC_DEFUN(KDE_SUBST_PROGRAMS,
KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)]) KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)])
KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)]) KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)])
fi fi
KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs]) KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs])
KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs]) KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then
kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share" kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs" test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs"
AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET) AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
if test "$KDE_XSL_STYLESHEET" = "NO"; then if test "$KDE_XSL_STYLESHEET" = "NO"; then
KDE_XSL_STYLESHEET="" KDE_XSL_STYLESHEET=""
@ -585,9 +585,9 @@ AC_DEFUN(KDE_SUBST_PROGRAMS,
if test -x "$KDECONFIG"; then # it can be "compiled" if test -x "$KDECONFIG"; then # it can be "compiled"
kde_libs_prefix=`$KDECONFIG --prefix` kde_libs_prefix=`$KDECONFIG --prefix`
if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs. AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs.
This means it has been moved since you installed it. This means it has been moved since you installed it.
This won't work. Please recompile kdelibs for the new prefix. This won't work. Please recompile tdelibs for the new prefix.
]) ])
fi fi
kde_libs_htmldir=`$KDECONFIG --install html --expandvars` kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
@ -667,7 +667,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
@ -887,7 +887,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
@ -1367,7 +1367,7 @@ qt_includes=""
AC_ARG_WITH(qt-dir, AC_ARG_WITH(qt-dir,
[ --with-qt-dir=DIR where the root of Qt is installed ], [ --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
]) ])
@ -1408,7 +1408,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
@ -1589,7 +1589,7 @@ rm -f actest.ui actest.cpp
AC_MSG_RESULT([$kde_cv_uic_plugins]) AC_MSG_RESULT([$kde_cv_uic_plugins])
if test "$kde_cv_uic_plugins" != yes; then if test "$kde_cv_uic_plugins" != yes; then
AC_MSG_ERROR([you need to install kdelibs first.]) AC_MSG_ERROR([you need to install tdelibs first.])
fi fi
fi fi
]) ])
@ -1673,12 +1673,12 @@ if test "${prefix}" != NONE; then
if test "${exec_prefix}" != NONE; then if test "${exec_prefix}" != NONE; then
kde_libraries=${libdir} kde_libraries=${libdir}
ac_kde_libraries=$libdir ac_kde_libraries=$libdir
if test "$ac_kde_libraries" = '${exec_prefix}/lib'${kdelibsuff}; then if test "$ac_kde_libraries" = '${exec_prefix}/lib'${tdelibsuff}; then
ac_kde_libraries=$exec_prefix/lib${kdelibsuff} ac_kde_libraries=$exec_prefix/lib${tdelibsuff}
fi fi
else else
kde_libraries=${prefix}/lib${kdelibsuff} kde_libraries=${prefix}/lib${tdelibsuff}
ac_kde_libraries=$prefix/lib${kdelibsuff} ac_kde_libraries=$prefix/lib${tdelibsuff}
fi fi
else else
ac_kde_includes= ac_kde_includes=
@ -1692,16 +1692,16 @@ AC_CACHE_VAL(ac_cv_have_kde,
if test "$kde_qtver" = 1; then if test "$kde_qtver" = 1; then
kde_check_header="ksock.h" kde_check_header="ksock.h"
kde_check_lib="libkdecore.la" kde_check_lib="libtdecore.la"
else else
kde_check_header="ksharedptr.h" kde_check_header="ksharedptr.h"
kde_check_lib="libkio.la" kde_check_lib="libtdeio.la"
fi fi
if test -z "$1"; then if test -z "$1"; then
kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs" test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs"
kde_incdirs="$ac_kde_includes $kde_incdirs" kde_incdirs="$ac_kde_includes $kde_incdirs"
AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir) AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
ac_kde_includes="$kde_incdir" ac_kde_includes="$kde_incdir"
@ -1712,8 +1712,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="/usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" kde_libdirs="/usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}"
test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs" test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs"
kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir) AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
ac_kde_libraries="$kde_libdir" ac_kde_libraries="$kde_libdir"
@ -1731,7 +1731,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
@ -1887,20 +1887,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");
@ -1934,7 +1934,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([
@ -1998,37 +1998,37 @@ AC_DEFUN(KDE_CREATE_LIBS_ALIASES,
AC_REQUIRE([K_PATH_X]) AC_REQUIRE([K_PATH_X])
if test $kde_qtver = 3; then if test $kde_qtver = 3; then
AC_SUBST(LIB_KDECORE, "-lkdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_KDEUI, "-lkdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KIO, "-ltdeio")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lkabc") AC_SUBST(LIB_KABC, "-ltdeabc")
AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_KDEPRINT, "-lkdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
# these are for backward compatibility # these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-lkio") AC_SUBST(LIB_KSYCOCA, "-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_KIO, "-ltdeio")
AC_SUBST(LIB_KSYCOCA, "-lksycoca") AC_SUBST(LIB_KSYCOCA, "-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_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_KPARTS, "-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
]) ])
@ -2093,7 +2093,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
@ -2369,7 +2369,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
]) ])
@ -2434,7 +2434,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
@ -3056,26 +3056,26 @@ See http:://objprelink.sourceforge.net for details:
AC_DEFUN(KDE_CHECK_LIB64, AC_DEFUN(KDE_CHECK_LIB64,
[ [
kdelibsuff=none tdelibsuff=none
AC_ARG_ENABLE(libsuffix, AC_ARG_ENABLE(libsuffix,
AC_HELP_STRING([--enable-libsuffix], AC_HELP_STRING([--enable-libsuffix],
[/lib directory suffix (64,32,none[=default])]), [/lib directory suffix (64,32,none[=default])]),
kdelibsuff=$enableval) tdelibsuff=$enableval)
# TODO: add an auto case that compiles a little C app to check # TODO: add an auto case that compiles a little C app to check
# where the glibc is # where the glibc is
if test "$kdelibsuff" = "none"; then if 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
]) ])
@ -3091,7 +3091,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
@ -4659,8 +4659,8 @@ AC_DEFUN(KDE_CONF_FILES,
AC_DEFUN(KDE_SET_PREFIX, AC_DEFUN(KDE_SET_PREFIX,
[ [
unset CDPATH unset CDPATH
dnl make $KDEDIR the default for the installation dnl make $TDEDIR the default for the installation
AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
if test "x$prefix" = "xNONE"; then if test "x$prefix" = "xNONE"; then
prefix=$ac_default_prefix prefix=$ac_default_prefix
@ -4739,15 +4739,15 @@ pushdef([AC_PROG_INSTALL],
fi fi
])dnl ])dnl
AC_DEFUN(KDE_LANG_CPLUSPLUS, AC_DEFUN(TDE_LANG_CPLUSPLUS,
[AC_LANG_CPLUSPLUS [AC_LANG_CPLUSPLUS
ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AC_FD_CC' ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AC_FD_CC'
pushdef([AC_LANG_CPLUSPLUS], [popdef([AC_LANG_CPLUSPLUS]) KDE_LANG_CPLUSPLUS]) pushdef([AC_LANG_CPLUSPLUS], [popdef([AC_LANG_CPLUSPLUS]) TDE_LANG_CPLUSPLUS])
]) ])
pushdef([AC_LANG_CPLUSPLUS], pushdef([AC_LANG_CPLUSPLUS],
[popdef([AC_LANG_CPLUSPLUS]) [popdef([AC_LANG_CPLUSPLUS])
KDE_LANG_CPLUSPLUS TDE_LANG_CPLUSPLUS
]) ])
AC_DEFUN(KDE_CHECK_LONG_LONG, AC_DEFUN(KDE_CHECK_LONG_LONG,
@ -5274,7 +5274,7 @@ ssl_includes=""
AC_ARG_WITH(ssl-dir, AC_ARG_WITH(ssl-dir,
[ --with-ssl-dir=DIR where the root of OpenSSL is installed], [ --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
@ -5294,7 +5294,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

2
doc/Makefile.am
Unescape View File

@ -1,6 +1,6 @@
# the SUBDIRS is filled automatically by am_edit. If files are # the SUBDIRS is filled automatically by am_edit. If files are
# in this directory they are installed into the english dir # in this directory they are installed into the english dir
KDE_LANG = en TDE_LANG = en
KDE_DOCS = ksensors KDE_DOCS = ksensors
SUBDIRS = $(AUTODIRS) SUBDIRS = $(AUTODIRS)

12
doc/Makefile.in
Unescape View File

@ -154,12 +154,12 @@ LIBZ = @LIBZ@
LIB_JASPER = @LIB_JASPER@ LIB_JASPER = @LIB_JASPER@
LIB_KAB = @LIB_KAB@ LIB_KAB = @LIB_KAB@
LIB_KABC = @LIB_KABC@ LIB_KABC = @LIB_KABC@
LIB_KDECORE = @LIB_KDECORE@ LIB_TDECORE = @LIB_TDECORE@
LIB_KDEPRINT = @LIB_KDEPRINT@ LIB_TDEPRINT = @LIB_TDEPRINT@
LIB_KDEUI = @LIB_KDEUI@ LIB_TDEUI = @LIB_TDEUI@
LIB_KFILE = @LIB_KFILE@ LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@ LIB_KFM = @LIB_KFM@
LIB_KHTML = @LIB_KHTML@ LIB_TDEHTML = @LIB_TDEHTML@
LIB_KIMGIO = @LIB_KIMGIO@ LIB_KIMGIO = @LIB_KIMGIO@
LIB_KIO = @LIB_KIO@ LIB_KIO = @LIB_KIO@
LIB_KPARTS = @LIB_KPARTS@ LIB_KPARTS = @LIB_KPARTS@
@ -248,7 +248,7 @@ kde_styledir = @kde_styledir@
kde_templatesdir = @kde_templatesdir@ kde_templatesdir = @kde_templatesdir@
kde_wallpaperdir = @kde_wallpaperdir@ kde_wallpaperdir = @kde_wallpaperdir@
kde_widgetdir = @kde_widgetdir@ kde_widgetdir = @kde_widgetdir@
kdeinitdir = @kdeinitdir@ tdeinitdir = @tdeinitdir@
micodir = @micodir@ micodir = @micodir@
qt_includes = @qt_includes@ qt_includes = @qt_includes@
qt_libraries = @qt_libraries@ qt_libraries = @qt_libraries@
@ -257,7 +257,7 @@ x_libraries = @x_libraries@
xdg_appsdir = @xdg_appsdir@ xdg_appsdir = @xdg_appsdir@
xdg_directorydir = @xdg_directorydir@ xdg_directorydir = @xdg_directorydir@
KDE_LANG = en TDE_LANG = en
KDE_DOCS = ksensors KDE_DOCS = ksensors
#>- SUBDIRS = $(AUTODIRS) #>- SUBDIRS = $(AUTODIRS)
#>+ 1 #>+ 1

2
doc/en/Makefile.am
Unescape View File

@ -1,2 +1,2 @@
KDE_DOCS = ksensors KDE_DOCS = ksensors
KDE_LANG = en TDE_LANG = en

36
doc/en/Makefile.in
Unescape View File

@ -151,12 +151,12 @@ LIBZ = @LIBZ@
LIB_JASPER = @LIB_JASPER@ LIB_JASPER = @LIB_JASPER@
LIB_KAB = @LIB_KAB@ LIB_KAB = @LIB_KAB@
LIB_KABC = @LIB_KABC@ LIB_KABC = @LIB_KABC@
LIB_KDECORE = @LIB_KDECORE@ LIB_TDECORE = @LIB_TDECORE@
LIB_KDEPRINT = @LIB_KDEPRINT@ LIB_TDEPRINT = @LIB_TDEPRINT@
LIB_KDEUI = @LIB_KDEUI@ LIB_TDEUI = @LIB_TDEUI@
LIB_KFILE = @LIB_KFILE@ LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@ LIB_KFM = @LIB_KFM@
LIB_KHTML = @LIB_KHTML@ LIB_TDEHTML = @LIB_TDEHTML@
LIB_KIMGIO = @LIB_KIMGIO@ LIB_KIMGIO = @LIB_KIMGIO@
LIB_KIO = @LIB_KIO@ LIB_KIO = @LIB_KIO@
LIB_KPARTS = @LIB_KPARTS@ LIB_KPARTS = @LIB_KPARTS@
@ -245,7 +245,7 @@ kde_styledir = @kde_styledir@
kde_templatesdir = @kde_templatesdir@ kde_templatesdir = @kde_templatesdir@
kde_wallpaperdir = @kde_wallpaperdir@ kde_wallpaperdir = @kde_wallpaperdir@
kde_widgetdir = @kde_widgetdir@ kde_widgetdir = @kde_widgetdir@
kdeinitdir = @kdeinitdir@ tdeinitdir = @tdeinitdir@
micodir = @micodir@ micodir = @micodir@
qt_includes = @qt_includes@ qt_includes = @qt_includes@
qt_libraries = @qt_libraries@ qt_libraries = @qt_libraries@
@ -254,7 +254,7 @@ x_libraries = @x_libraries@
xdg_appsdir = @xdg_appsdir@ xdg_appsdir = @xdg_appsdir@
xdg_directorydir = @xdg_directorydir@ xdg_directorydir = @xdg_directorydir@
KDE_DOCS = ksensors KDE_DOCS = ksensors
KDE_LANG = en TDE_LANG = en
subdir = doc/en subdir = doc/en
mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h CONFIG_HEADER = $(top_builddir)/config.h
@ -416,19 +416,19 @@ index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
docs-am: index.cache.bz2 docs-am: index.cache.bz2
install-docs: docs-am install-nls install-docs: docs-am install-nls
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/ksensors $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(TDE_LANG)/ksensors
@if test -f index.cache.bz2; then \ @if test -f index.cache.bz2; then \
echo $(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/ksensors/; \ echo $(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(TDE_LANG)/ksensors/; \
$(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/ksensors/; \ $(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(TDE_LANG)/ksensors/; \
elif test -f $(srcdir)/index.cache.bz2; then \ elif test -f $(srcdir)/index.cache.bz2; then \
echo $(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/ksensors/; \ echo $(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(TDE_LANG)/ksensors/; \
$(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/ksensors/; \ $(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(TDE_LANG)/ksensors/; \
fi fi
-rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/ksensors/common -rm -f $(DESTDIR)$(kde_htmldir)/$(TDE_LANG)/ksensors/common
$(LN_S) $(kde_libs_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/ksensors/common $(LN_S) $(kde_libs_htmldir)/$(TDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(TDE_LANG)/ksensors/common
uninstall-docs: uninstall-docs:
-rm -rf $(kde_htmldir)/$(KDE_LANG)/ksensors -rm -rf $(kde_htmldir)/$(TDE_LANG)/ksensors
clean-docs: clean-docs:
-rm -f index.cache.bz2 -rm -f index.cache.bz2
@ -436,15 +436,15 @@ clean-docs:
#>+ 13 #>+ 13
install-nls: install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/ksensors $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(TDE_LANG)/ksensors
@for base in index.docbook ; do \ @for base in index.docbook ; do \
echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/ksensors/$$base ;\ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(TDE_LANG)/ksensors/$$base ;\
$(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/ksensors/$$base ;\ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(TDE_LANG)/ksensors/$$base ;\
done done
uninstall-nls: uninstall-nls:
for base in index.docbook ; do \ for base in index.docbook ; do \
rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/ksensors/$$base ;\ rm -f $(DESTDIR)$(kde_htmldir)/$(TDE_LANG)/ksensors/$$base ;\
done done

6
doc/en/index.docbook
Unescape View File

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

4
ksensors.kdevelop
Unescape View File

@ -1,5 +1,5 @@
<?xml version = '1.0'?> <?xml version = '1.0'?>
<kdevelop> <tdevelop>
<general> <general>
<author>Miguel Novas</author> <author>Miguel Novas</author>
<email>migueln@users.sourceforge.net</email> <email>migueln@users.sourceforge.net</email>
@ -146,4 +146,4 @@
<implementationsuffix>.cpp</implementationsuffix> <implementationsuffix>.cpp</implementationsuffix>
</filetemplates> </filetemplates>
</cppsupportpart> </cppsupportpart>
</kdevelop> </tdevelop>

2
ksensors.kdevses
Unescape View File

@ -2,7 +2,7 @@
<!DOCTYPE KDevPrjSession> <!DOCTYPE KDevPrjSession>
<KDevPrjSession> <KDevPrjSession>
<DocsAndViews NumberOfDocuments="1" > <DocsAndViews NumberOfDocuments="1" >
<Doc0 NumberOfViews="1" URL="file:/tmp/ksensors-0.7.3/ksensors.kdevelop" > <Doc0 NumberOfViews="1" URL="file:/tmp/ksensors-0.7.3/ksensors.tdevelop" >
<View0 line="0" Type="???" > <View0 line="0" Type="???" >
<AdditionalSettings Top="1" Width="1087" Attach="1" Height="647" Left="1" MinMaxMode="0" /> <AdditionalSettings Top="1" Width="1087" Attach="1" Height="647" Left="1" MinMaxMode="0" />
</View0> </View0>

10
po/Makefile.in
Unescape View File

@ -151,12 +151,12 @@ LIBZ = @LIBZ@
LIB_JASPER = @LIB_JASPER@ LIB_JASPER = @LIB_JASPER@
LIB_KAB = @LIB_KAB@ LIB_KAB = @LIB_KAB@
LIB_KABC = @LIB_KABC@ LIB_KABC = @LIB_KABC@
LIB_KDECORE = @LIB_KDECORE@ LIB_TDECORE = @LIB_TDECORE@
LIB_KDEPRINT = @LIB_KDEPRINT@ LIB_TDEPRINT = @LIB_TDEPRINT@
LIB_KDEUI = @LIB_KDEUI@ LIB_TDEUI = @LIB_TDEUI@
LIB_KFILE = @LIB_KFILE@ LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@ LIB_KFM = @LIB_KFM@
LIB_KHTML = @LIB_KHTML@ LIB_TDEHTML = @LIB_TDEHTML@
LIB_KIMGIO = @LIB_KIMGIO@ LIB_KIMGIO = @LIB_KIMGIO@
LIB_KIO = @LIB_KIO@ LIB_KIO = @LIB_KIO@
LIB_KPARTS = @LIB_KPARTS@ LIB_KPARTS = @LIB_KPARTS@
@ -245,7 +245,7 @@ kde_styledir = @kde_styledir@
kde_templatesdir = @kde_templatesdir@ kde_templatesdir = @kde_templatesdir@
kde_wallpaperdir = @kde_wallpaperdir@ kde_wallpaperdir = @kde_wallpaperdir@
kde_widgetdir = @kde_widgetdir@ kde_widgetdir = @kde_widgetdir@
kdeinitdir = @kdeinitdir@ tdeinitdir = @tdeinitdir@
micodir = @micodir@ micodir = @micodir@
qt_includes = @qt_includes@ qt_includes = @qt_includes@
qt_libraries = @qt_libraries@ qt_libraries = @qt_libraries@

22
src/Makefile.in
Unescape View File

@ -151,12 +151,12 @@ LIBZ = @LIBZ@
LIB_JASPER = @LIB_JASPER@ LIB_JASPER = @LIB_JASPER@
LIB_KAB = @LIB_KAB@ LIB_KAB = @LIB_KAB@
LIB_KABC = @LIB_KABC@ LIB_KABC = @LIB_KABC@
LIB_KDECORE = @LIB_KDECORE@ LIB_TDECORE = @LIB_TDECORE@
LIB_KDEPRINT = @LIB_KDEPRINT@ LIB_TDEPRINT = @LIB_TDEPRINT@
LIB_KDEUI = @LIB_KDEUI@ LIB_TDEUI = @LIB_TDEUI@
LIB_KFILE = @LIB_KFILE@ LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@ LIB_KFM = @LIB_KFM@
LIB_KHTML = @LIB_KHTML@ LIB_TDEHTML = @LIB_TDEHTML@
LIB_KIMGIO = @LIB_KIMGIO@ LIB_KIMGIO = @LIB_KIMGIO@
LIB_KIO = @LIB_KIO@ LIB_KIO = @LIB_KIO@
LIB_KPARTS = @LIB_KPARTS@ LIB_KPARTS = @LIB_KPARTS@
@ -245,7 +245,7 @@ kde_styledir = @kde_styledir@
kde_templatesdir = @kde_templatesdir@ kde_templatesdir = @kde_templatesdir@
kde_wallpaperdir = @kde_wallpaperdir@ kde_wallpaperdir = @kde_wallpaperdir@
kde_widgetdir = @kde_widgetdir@ kde_widgetdir = @kde_widgetdir@
kdeinitdir = @kdeinitdir@ tdeinitdir = @tdeinitdir@
micodir = @micodir@ micodir = @micodir@
qt_includes = @qt_includes@ qt_includes = @qt_includes@
qt_libraries = @qt_libraries@ qt_libraries = @qt_libraries@
@ -311,7 +311,7 @@ ksensors_SOURCES=main.cpp ksensors.cpp \
ksensors_LDFLAGS = $(KDE_RPATH) $(all_libraries) ksensors_LDFLAGS = $(KDE_RPATH) $(all_libraries)
ksensors_LDADD = $(LIB_KDEUI) $(LIB_KDECORE) -lsensors -lm ksensors_LDADD = $(LIB_TDEUI) $(LIB_TDECORE) -lsensors -lm
# this is where the desktop file will go # this is where the desktop file will go
shelldesktopdir = $(kde_appsdir)/Utilities shelldesktopdir = $(kde_appsdir)/Utilities
@ -1207,7 +1207,7 @@ $(srcdir)/sensorslist.cpp: aboutcfgdesign.h generalcfgdesign.h lmsensorscfgdesig
#>+ 70 #>+ 70
lmsensorscfgdesign.cpp: $(srcdir)/lmsensorscfgdesign.ui lmsensorscfgdesign.h lmsensorscfgdesign.moc lmsensorscfgdesign.cpp: $(srcdir)/lmsensorscfgdesign.ui lmsensorscfgdesign.h lmsensorscfgdesign.moc
rm -f lmsensorscfgdesign.cpp rm -f lmsensorscfgdesign.cpp
echo '#include <klocale.h>' > lmsensorscfgdesign.cpp echo '#include <tdelocale.h>' > lmsensorscfgdesign.cpp
$(UIC) -tr ${UIC_TR} -i lmsensorscfgdesign.h $(srcdir)/lmsensorscfgdesign.ui > lmsensorscfgdesign.cpp.temp ; ret=$$?; \ $(UIC) -tr ${UIC_TR} -i lmsensorscfgdesign.h $(srcdir)/lmsensorscfgdesign.ui > lmsensorscfgdesign.cpp.temp ; ret=$$?; \
sed -e "s,${UIC_TR}( \"\" ),QString::null,g" lmsensorscfgdesign.cpp.temp | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_lmsensorscfgdesign,g" >> lmsensorscfgdesign.cpp ;\ sed -e "s,${UIC_TR}( \"\" ),QString::null,g" lmsensorscfgdesign.cpp.temp | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_lmsensorscfgdesign,g" >> lmsensorscfgdesign.cpp ;\
rm -f lmsensorscfgdesign.cpp.temp ;\ rm -f lmsensorscfgdesign.cpp.temp ;\
@ -1221,7 +1221,7 @@ lmsensorscfgdesign.moc: lmsensorscfgdesign.h
aboutcfgdesign.cpp: $(srcdir)/aboutcfgdesign.ui aboutcfgdesign.h aboutcfgdesign.moc aboutcfgdesign.cpp: $(srcdir)/aboutcfgdesign.ui aboutcfgdesign.h aboutcfgdesign.moc
rm -f aboutcfgdesign.cpp rm -f aboutcfgdesign.cpp
echo '#include <klocale.h>' > aboutcfgdesign.cpp echo '#include <tdelocale.h>' > aboutcfgdesign.cpp
$(UIC) -tr ${UIC_TR} -i aboutcfgdesign.h $(srcdir)/aboutcfgdesign.ui > aboutcfgdesign.cpp.temp ; ret=$$?; \ $(UIC) -tr ${UIC_TR} -i aboutcfgdesign.h $(srcdir)/aboutcfgdesign.ui > aboutcfgdesign.cpp.temp ; ret=$$?; \
sed -e "s,${UIC_TR}( \"\" ),QString::null,g" aboutcfgdesign.cpp.temp | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_aboutcfgdesign,g" >> aboutcfgdesign.cpp ;\ sed -e "s,${UIC_TR}( \"\" ),QString::null,g" aboutcfgdesign.cpp.temp | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_aboutcfgdesign,g" >> aboutcfgdesign.cpp ;\
rm -f aboutcfgdesign.cpp.temp ;\ rm -f aboutcfgdesign.cpp.temp ;\
@ -1235,7 +1235,7 @@ aboutcfgdesign.moc: aboutcfgdesign.h
systemcfgdesign.cpp: $(srcdir)/systemcfgdesign.ui systemcfgdesign.h systemcfgdesign.moc systemcfgdesign.cpp: $(srcdir)/systemcfgdesign.ui systemcfgdesign.h systemcfgdesign.moc
rm -f systemcfgdesign.cpp rm -f systemcfgdesign.cpp
echo '#include <klocale.h>' > systemcfgdesign.cpp echo '#include <tdelocale.h>' > systemcfgdesign.cpp
$(UIC) -tr ${UIC_TR} -i systemcfgdesign.h $(srcdir)/systemcfgdesign.ui > systemcfgdesign.cpp.temp ; ret=$$?; \ $(UIC) -tr ${UIC_TR} -i systemcfgdesign.h $(srcdir)/systemcfgdesign.ui > systemcfgdesign.cpp.temp ; ret=$$?; \
sed -e "s,${UIC_TR}( \"\" ),QString::null,g" systemcfgdesign.cpp.temp | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_systemcfgdesign,g" >> systemcfgdesign.cpp ;\ sed -e "s,${UIC_TR}( \"\" ),QString::null,g" systemcfgdesign.cpp.temp | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_systemcfgdesign,g" >> systemcfgdesign.cpp ;\
rm -f systemcfgdesign.cpp.temp ;\ rm -f systemcfgdesign.cpp.temp ;\
@ -1249,7 +1249,7 @@ systemcfgdesign.moc: systemcfgdesign.h
palettecfgdesign.cpp: $(srcdir)/palettecfgdesign.ui palettecfgdesign.h palettecfgdesign.moc palettecfgdesign.cpp: $(srcdir)/palettecfgdesign.ui palettecfgdesign.h palettecfgdesign.moc
rm -f palettecfgdesign.cpp rm -f palettecfgdesign.cpp
echo '#include <klocale.h>' > palettecfgdesign.cpp echo '#include <tdelocale.h>' > palettecfgdesign.cpp
$(UIC) -tr ${UIC_TR} -i palettecfgdesign.h $(srcdir)/palettecfgdesign.ui > palettecfgdesign.cpp.temp ; ret=$$?; \ $(UIC) -tr ${UIC_TR} -i palettecfgdesign.h $(srcdir)/palettecfgdesign.ui > palettecfgdesign.cpp.temp ; ret=$$?; \
sed -e "s,${UIC_TR}( \"\" ),QString::null,g" palettecfgdesign.cpp.temp | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_palettecfgdesign,g" >> palettecfgdesign.cpp ;\ sed -e "s,${UIC_TR}( \"\" ),QString::null,g" palettecfgdesign.cpp.temp | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_palettecfgdesign,g" >> palettecfgdesign.cpp ;\
rm -f palettecfgdesign.cpp.temp ;\ rm -f palettecfgdesign.cpp.temp ;\
@ -1263,7 +1263,7 @@ palettecfgdesign.moc: palettecfgdesign.h
generalcfgdesign.cpp: $(srcdir)/generalcfgdesign.ui generalcfgdesign.h generalcfgdesign.moc generalcfgdesign.cpp: $(srcdir)/generalcfgdesign.ui generalcfgdesign.h generalcfgdesign.moc
rm -f generalcfgdesign.cpp rm -f generalcfgdesign.cpp
echo '#include <klocale.h>' > generalcfgdesign.cpp echo '#include <tdelocale.h>' > generalcfgdesign.cpp
$(UIC) -tr ${UIC_TR} -i generalcfgdesign.h $(srcdir)/generalcfgdesign.ui > generalcfgdesign.cpp.temp ; ret=$$?; \ $(UIC) -tr ${UIC_TR} -i generalcfgdesign.h $(srcdir)/generalcfgdesign.ui > generalcfgdesign.cpp.temp ; ret=$$?; \
sed -e "s,${UIC_TR}( \"\" ),QString::null,g" generalcfgdesign.cpp.temp | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_generalcfgdesign,g" >> generalcfgdesign.cpp ;\ sed -e "s,${UIC_TR}( \"\" ),QString::null,g" generalcfgdesign.cpp.temp | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_generalcfgdesign,g" >> generalcfgdesign.cpp ;\
rm -f generalcfgdesign.cpp.temp ;\ rm -f generalcfgdesign.cpp.temp ;\

4
src/pics/Makefile.am
Unescape View File

@ -1,4 +1,4 @@
####### kdevelop will overwrite this part!!! (begin)########## ####### tdevelop will overwrite this part!!! (begin)##########
INCLUDES = $(all_includes) INCLUDES = $(all_includes)
@ -59,4 +59,4 @@ uninstall-local:
-rm -f $(kde_icondir)/hicolor/32x32/apps/ksensors.png -rm -f $(kde_icondir)/hicolor/32x32/apps/ksensors.png
-rm -f $(kde_icondir)/hicolor/16x16/apps/ksensors.png -rm -f $(kde_icondir)/hicolor/16x16/apps/ksensors.png
####### kdevelop will overwrite this part!!! (end)############ ####### tdevelop will overwrite this part!!! (end)############

14
src/pics/Makefile.in
Unescape View File

@ -15,7 +15,7 @@
@SET_MAKE@ @SET_MAKE@
####### kdevelop will overwrite this part!!! (begin)########## ####### tdevelop will overwrite this part!!! (begin)##########
SHELL = @SHELL@ SHELL = @SHELL@
srcdir = @srcdir@ srcdir = @srcdir@
@ -153,12 +153,12 @@ LIBZ = @LIBZ@
LIB_JASPER = @LIB_JASPER@ LIB_JASPER = @LIB_JASPER@
LIB_KAB = @LIB_KAB@ LIB_KAB = @LIB_KAB@
LIB_KABC = @LIB_KABC@ LIB_KABC = @LIB_KABC@
LIB_KDECORE = @LIB_KDECORE@ LIB_TDECORE = @LIB_TDECORE@
LIB_KDEPRINT = @LIB_KDEPRINT@ LIB_TDEPRINT = @LIB_TDEPRINT@
LIB_KDEUI = @LIB_KDEUI@ LIB_TDEUI = @LIB_TDEUI@
LIB_KFILE = @LIB_KFILE@ LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@ LIB_KFM = @LIB_KFM@
LIB_KHTML = @LIB_KHTML@ LIB_TDEHTML = @LIB_TDEHTML@
LIB_KIMGIO = @LIB_KIMGIO@ LIB_KIMGIO = @LIB_KIMGIO@
LIB_KIO = @LIB_KIO@ LIB_KIO = @LIB_KIO@
LIB_KPARTS = @LIB_KPARTS@ LIB_KPARTS = @LIB_KPARTS@
@ -247,7 +247,7 @@ kde_styledir = @kde_styledir@
kde_templatesdir = @kde_templatesdir@ kde_templatesdir = @kde_templatesdir@
kde_wallpaperdir = @kde_wallpaperdir@ kde_wallpaperdir = @kde_wallpaperdir@
kde_widgetdir = @kde_widgetdir@ kde_widgetdir = @kde_widgetdir@
kdeinitdir = @kdeinitdir@ tdeinitdir = @tdeinitdir@
micodir = @micodir@ micodir = @micodir@
qt_includes = @qt_includes@ qt_includes = @qt_includes@
qt_libraries = @qt_libraries@ qt_libraries = @qt_libraries@
@ -556,7 +556,7 @@ uninstall-local:
#>+ 1 #>+ 1
-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ksensors.png -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ksensors.png
####### kdevelop will overwrite this part!!! (end)############ ####### tdevelop will overwrite this part!!! (end)############
# Tell versions [3.59,3.63) of GNU make to not export all variables. # Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded. # Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT: .NOEXPORT:

4
src/sounds/Makefile.am
Unescape View File

@ -1,4 +1,4 @@
####### kdevelop will overwrite this part!!! (begin)########## ####### tdevelop will overwrite this part!!! (begin)##########
INCLUDES = $(all_includes) INCLUDES = $(all_includes)
@ -10,4 +10,4 @@ install-data-local:
uninstall-local: uninstall-local:
rm -f $(kde_sounddir)/ksensors_alert.wav rm -f $(kde_sounddir)/ksensors_alert.wav
####### kdevelop will overwrite this part!!! (end)############ ####### tdevelop will overwrite this part!!! (end)############

14
src/sounds/Makefile.in
Unescape View File

@ -15,7 +15,7 @@
@SET_MAKE@ @SET_MAKE@
####### kdevelop will overwrite this part!!! (begin)########## ####### tdevelop will overwrite this part!!! (begin)##########
SHELL = @SHELL@ SHELL = @SHELL@
srcdir = @srcdir@ srcdir = @srcdir@
@ -153,12 +153,12 @@ LIBZ = @LIBZ@
LIB_JASPER = @LIB_JASPER@ LIB_JASPER = @LIB_JASPER@
LIB_KAB = @LIB_KAB@ LIB_KAB = @LIB_KAB@
LIB_KABC = @LIB_KABC@ LIB_KABC = @LIB_KABC@
LIB_KDECORE = @LIB_KDECORE@ LIB_TDECORE = @LIB_TDECORE@
LIB_KDEPRINT = @LIB_KDEPRINT@ LIB_TDEPRINT = @LIB_TDEPRINT@
LIB_KDEUI = @LIB_KDEUI@ LIB_TDEUI = @LIB_TDEUI@
LIB_KFILE = @LIB_KFILE@ LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@ LIB_KFM = @LIB_KFM@
LIB_KHTML = @LIB_KHTML@ LIB_TDEHTML = @LIB_TDEHTML@
LIB_KIMGIO = @LIB_KIMGIO@ LIB_KIMGIO = @LIB_KIMGIO@
LIB_KIO = @LIB_KIO@ LIB_KIO = @LIB_KIO@
LIB_KPARTS = @LIB_KPARTS@ LIB_KPARTS = @LIB_KPARTS@
@ -247,7 +247,7 @@ kde_styledir = @kde_styledir@
kde_templatesdir = @kde_templatesdir@ kde_templatesdir = @kde_templatesdir@
kde_wallpaperdir = @kde_wallpaperdir@ kde_wallpaperdir = @kde_wallpaperdir@
kde_widgetdir = @kde_widgetdir@ kde_widgetdir = @kde_widgetdir@
kdeinitdir = @kdeinitdir@ tdeinitdir = @tdeinitdir@
micodir = @micodir@ micodir = @micodir@
qt_includes = @qt_includes@ qt_includes = @qt_includes@
qt_libraries = @qt_libraries@ qt_libraries = @qt_libraries@
@ -411,7 +411,7 @@ uninstall-local:
#>+ 1 #>+ 1
-rm -f $(DESTDIR)$(kde_sounddir)/ksensors_alert.wav -rm -f $(DESTDIR)$(kde_sounddir)/ksensors_alert.wav
####### kdevelop will overwrite this part!!! (end)############ ####### tdevelop will overwrite this part!!! (end)############
# Tell versions [3.59,3.63) of GNU make to not export all variables. # Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded. # Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT: .NOEXPORT:

Write Preview
Loading…
Cancel
Save