TDE
/
twin-style-machbunt
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/twin-style-machbunt.git
0
0
Fork 0
Code Issues Releases Wiki Activity

KDE3->TDE conversion

Browse Source 
Signed-off-by: Mavridis Philippe <mavridisf@gmail.com>
pull/2/head
Mavridis Philippe 2 years ago
parent e49c3e89f8
commit 33d0b7b115
No known key found for this signature in database
GPG Key ID: F8D2D7E2F989A494
21 changed files with 686 additions and 686 deletions
Show Stats Download Patch File Download Diff File

2
ChangeLog
Unescape View File

@ -1,4 +1,4 @@
0.1 0.1
-extracted from kdebase3-SUSE source package (9.2) -extracted from tdebase3-SUSE source package (9.2)
-added colorscheme -added colorscheme

2
INSTALL
Unescape View File

@ -7,7 +7,7 @@ Usually the chain
make make
make install make install
should work. The installation paths are detected with kde-config. should work. The installation paths are detected with tde-config.
If not you can tune them with the --prefix= option for configure. If not you can tune them with the --prefix= option for configure.
For more options see the output of './configure --help'. For more options see the output of './configure --help'.

6
MachBunt.spec
Unescape View File

@ -1,5 +1,5 @@
# #
# spec file for package kwin-decor-suse (Version 0.2) # spec file for package twin-decor-suse (Version 0.2)
# #
# Copyright (c) 2005 Gerd Fleischer # Copyright (c) 2005 Gerd Fleischer
# This file and all modifications and additions to the pristine # This file and all modifications and additions to the pristine
@ -8,7 +8,7 @@
%define DIST %(if [ -r /etc/SuSE-release ]; then echo "SuSE"; else echo "Unknown"; fi) %define DIST %(if [ -r /etc/SuSE-release ]; then echo "SuSE"; else echo "Unknown"; fi)
Name: MachBunt Name: MachBunt
URL: http://www.gerdfleischer.de/kwin-decor-suse2/ URL: http://www.gerdfleischer.de/twin-decor-suse2/
License: GPL License: GPL
Group: System/GUI/KDE Group: System/GUI/KDE
Summary: The KDE window decoration from SUSE 9.1/9.2 Summary: The KDE window decoration from SUSE 9.1/9.2
@ -18,7 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: %name-%version.tar.bz2 Source: %name-%version.tar.bz2
%description %description
The KDE window decoration from SUSE 9.3/10.0 extracted from the kdebase3-SUSE package. The KDE window decoration from SUSE 9.3/10.0 extracted from the tdebase3-SUSE package.
Authors: Authors:
-------- --------

32
Makefile.in
Unescape View File

@ -170,24 +170,24 @@ LIBUTIL = @LIBUTIL@
LIBZ = @LIBZ@ LIBZ = @LIBZ@
LIB_KAB = @LIB_KAB@ LIB_KAB = @LIB_KAB@
LIB_KABC = @LIB_KABC@ LIB_KABC = @LIB_KABC@
LIB_KDECORE = @LIB_KDECORE@ LIB_TDECORE = @LIB_TDECORE@
LIB_KDED = @LIB_KDED@ LIB_KDED = @LIB_KDED@
LIB_KDEPIM = @LIB_KDEPIM@ LIB_TDEPIM = @LIB_TDEPIM@
LIB_KDEPRINT = @LIB_KDEPRINT@ LIB_TDEPRINT = @LIB_TDEPRINT@
LIB_KDEUI = @LIB_KDEUI@ LIB_TDEUI = @LIB_TDEUI@
LIB_KDNSSD = @LIB_KDNSSD@ LIB_TDEDNSSD = @LIB_TDEDNSSD@
LIB_KFILE = @LIB_KFILE@ LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@ LIB_KFM = @LIB_KFM@
LIB_KHTML = @LIB_KHTML@ LIB_TDEHTML = @LIB_TDEHTML@
LIB_KIMPROXY = @LIB_KIMPROXY@ LIB_TDEIMPROXY = @LIB_TDEIMPROXY@
LIB_KIO = @LIB_KIO@ LIB_TDEIO = @LIB_TDEIO@
LIB_KJS = @LIB_KJS@ LIB_KJS = @LIB_KJS@
LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
LIB_KPARTS = @LIB_KPARTS@ LIB_TDEPARTS = @LIB_TDEPARTS@
LIB_KSPELL = @LIB_KSPELL@ LIB_TDESPELL = @LIB_TDESPELL@
LIB_KSYCOCA = @LIB_KSYCOCA@ LIB_TDESYCOCA = @LIB_TDESYCOCA@
LIB_KUNITTEST = @LIB_KUNITTEST@ LIB_TDEUNITTEST = @LIB_TDEUNITTEST@
LIB_KUTILS = @LIB_KUTILS@ LIB_TDEUTILS = @LIB_TDEUTILS@
LIB_POLL = @LIB_POLL@ LIB_POLL = @LIB_POLL@
LIB_QPE = @LIB_QPE@ LIB_QPE = @LIB_QPE@
LIB_QT = @LIB_QT@ LIB_QT = @LIB_QT@
@ -198,7 +198,7 @@ LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MAKETDEWIDGETS = @MAKETDEWIDGETS@
MCOPIDL = @MCOPIDL@ MCOPIDL = @MCOPIDL@
MEINPROC = @MEINPROC@ MEINPROC = @MEINPROC@
MOC = @MOC@ MOC = @MOC@
@ -297,7 +297,7 @@ kde_styledir = @kde_styledir@
kde_templatesdir = @kde_templatesdir@ kde_templatesdir = @kde_templatesdir@
kde_wallpaperdir = @kde_wallpaperdir@ kde_wallpaperdir = @kde_wallpaperdir@
kde_widgetdir = @kde_widgetdir@ kde_widgetdir = @kde_widgetdir@
kdeinitdir = @kdeinitdir@ tdeinitdir = @tdeinitdir@
libdir = @libdir@ libdir = @libdir@
libexecdir = @libexecdir@ libexecdir = @libexecdir@
localstatedir = @localstatedir@ localstatedir = @localstatedir@
@ -811,7 +811,7 @@ dist-hook:
.NOEXPORT: .NOEXPORT:
#>+ 2 #>+ 2
KDE_DIST=stamp-h.in subdirs Makefile.in configure.files suse2.kdevelop config.h.in configure.in Makefile.cvs aclocal.m4 Doxyfile acinclude.m4 configure Makefile.am kwin-decor-suse2.spec KDE_DIST=stamp-h.in subdirs Makefile.in configure.files suse2.tdevelop config.h.in configure.in Makefile.cvs aclocal.m4 Doxyfile acinclude.m4 configure Makefile.am twin-decor-suse2.spec
#>+ 2 #>+ 2
docs-am: docs-am:

276
acinclude.m4
Unescape View File

@ -23,8 +23,8 @@ dnl IMPORTANT NOTE:
dnl Please do not modify this file unless you expect your modifications to be dnl Please do not modify this file unless you expect your modifications to be
dnl carried into every other module in the repository. dnl carried into every other module in the repository.
dnl dnl
dnl Single-module modifications are best placed in configure.in for kdelibs dnl Single-module modifications are best placed in configure.in for tdelibs
dnl and kdebase or configure.in.in if present. dnl and tdebase or configure.in.in if present.
# KDE_PATH_X_DIRECT # KDE_PATH_X_DIRECT
dnl Internal subroutine of AC_PATH_X. dnl Internal subroutine of AC_PATH_X.
@ -103,41 +103,41 @@ ac_x_libraries=],
[LIBS="$ac_save_LIBS" [LIBS="$ac_save_LIBS"
# First see if replacing the include by lib works. # First see if replacing the include by lib works.
# Check X11 before X11Rn because it is often a symlink to the current release. # Check X11 before X11Rn because it is often a symlink to the current release.
for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \ for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \
/usr/X11/lib${kdelibsuff} \ /usr/X11/lib${tdelibsuff} \
/usr/X11R6/lib${kdelibsuff} \ /usr/X11R6/lib${tdelibsuff} \
/usr/X11R5/lib${kdelibsuff} \ /usr/X11R5/lib${tdelibsuff} \
/usr/X11R4/lib${kdelibsuff} \ /usr/X11R4/lib${tdelibsuff} \
\ \
/usr/lib${kdelibsuff}/X11 \ /usr/lib${tdelibsuff}/X11 \
/usr/lib${kdelibsuff}/X11R6 \ /usr/lib${tdelibsuff}/X11R6 \
/usr/lib${kdelibsuff}/X11R5 \ /usr/lib${tdelibsuff}/X11R5 \
/usr/lib${kdelibsuff}/X11R4 \ /usr/lib${tdelibsuff}/X11R4 \
\ \
/usr/local/X11/lib${kdelibsuff} \ /usr/local/X11/lib${tdelibsuff} \
/usr/local/X11R6/lib${kdelibsuff} \ /usr/local/X11R6/lib${tdelibsuff} \
/usr/local/X11R5/lib${kdelibsuff} \ /usr/local/X11R5/lib${tdelibsuff} \
/usr/local/X11R4/lib${kdelibsuff} \ /usr/local/X11R4/lib${tdelibsuff} \
\ \
/usr/local/lib${kdelibsuff}/X11 \ /usr/local/lib${tdelibsuff}/X11 \
/usr/local/lib${kdelibsuff}/X11R6 \ /usr/local/lib${tdelibsuff}/X11R6 \
/usr/local/lib${kdelibsuff}/X11R5 \ /usr/local/lib${tdelibsuff}/X11R5 \
/usr/local/lib${kdelibsuff}/X11R4 \ /usr/local/lib${tdelibsuff}/X11R4 \
\ \
/usr/X386/lib${kdelibsuff} \ /usr/X386/lib${tdelibsuff} \
/usr/x386/lib${kdelibsuff} \ /usr/x386/lib${tdelibsuff} \
/usr/XFree86/lib${kdelibsuff}/X11 \ /usr/XFree86/lib${tdelibsuff}/X11 \
\ \
/usr/lib${kdelibsuff} \ /usr/lib${tdelibsuff} \
/usr/local/lib${kdelibsuff} \ /usr/local/lib${tdelibsuff} \
/usr/unsupported/lib${kdelibsuff} \ /usr/unsupported/lib${tdelibsuff} \
/usr/athena/lib${kdelibsuff} \ /usr/athena/lib${tdelibsuff} \
/usr/local/x11r5/lib${kdelibsuff} \ /usr/local/x11r5/lib${tdelibsuff} \
/usr/lpp/Xamples/lib${kdelibsuff} \ /usr/lpp/Xamples/lib${tdelibsuff} \
/lib/usr/lib${kdelibsuff}/X11 \ /lib/usr/lib${tdelibsuff}/X11 \
\ \
/usr/openwin/lib${kdelibsuff} \ /usr/openwin/lib${tdelibsuff} \
/usr/openwin/share/lib${kdelibsuff} \ /usr/openwin/share/lib${tdelibsuff} \
; \ ; \
do do
dnl Don't even attempt the hair of trying to link an X program! dnl Don't even attempt the hair of trying to link an X program!
@ -371,24 +371,24 @@ AC_DEFUN([KDE_1_CHECK_PATHS],
fi fi
AC_MSG_CHECKING([for KDE libraries installed]) AC_MSG_CHECKING([for KDE libraries installed])
ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5' ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5'
if AC_TRY_EVAL(ac_link) && test -s conftest; then if AC_TRY_EVAL(ac_link) && test -s conftest; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
else else
AC_MSG_ERROR([your system fails at linking a small KDE application! AC_MSG_ERROR([your system fails at linking a small KDE application!
Check, if your compiler is installed correctly and if you have used the Check, if your compiler is installed correctly and if you have used the
same compiler to compile Qt and kdelibs as you did use now. same compiler to compile Qt and tdelibs as you did use now.
For more details about this problem, look at the end of config.log.]) For more details about this problem, look at the end of config.log.])
fi fi
if eval `KDEDIR= ./conftest 2>&5`; then if eval `TDEDIR= ./conftest 2>&5`; then
kde_result=done kde_result=done
else else
kde_result=problems kde_result=problems
fi fi
KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
kde_have_all_paths=yes kde_have_all_paths=yes
KDE_SET_PATHS($kde_result) KDE_SET_PATHS($kde_result)
@ -547,11 +547,11 @@ Please check whether you installed aRts correctly or use
AC_DEFUN([KDE_SET_DEFAULT_BINDIRS], AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
[ [
kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin" kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs" test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
if test -n "$KDEDIRS"; then if test -n "$TDEDIRS"; then
kde_save_IFS=$IFS kde_save_IFS=$IFS
IFS=: IFS=:
for dir in $KDEDIRS; do for dir in $TDEDIRS; do
kde_default_bindirs="$dir/bin $kde_default_bindirs " kde_default_bindirs="$dir/bin $kde_default_bindirs "
done done
IFS=$kde_save_IFS IFS=$kde_save_IFS
@ -602,18 +602,18 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi fi
if test -n "$kde32ornewer"; then if test -n "$kde32ornewer"; then
KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)]) KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
fi fi
if test -n "$kde33ornewer"; then if test -n "$kde33ornewer"; then
KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)]) KDE_FIND_PATH(maketdewidgets, MAKETDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(maketdewidgets)])
AC_SUBST(MAKEKDEWIDGETS) AC_SUBST(MAKETDEWIDGETS)
fi fi
KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""]) KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share" kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs" test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs"
AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET) AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
if test "$KDE_XSL_STYLESHEET" = "NO"; then if test "$KDE_XSL_STYLESHEET" = "NO"; then
KDE_XSL_STYLESHEET="" KDE_XSL_STYLESHEET=""
@ -710,7 +710,7 @@ AC_SUBST(kde_templatesdir)
AC_SUBST(kde_servicesdir) AC_SUBST(kde_servicesdir)
AC_SUBST(kde_servicetypesdir) AC_SUBST(kde_servicetypesdir)
AC_SUBST(kde_moduledir) AC_SUBST(kde_moduledir)
AC_SUBST(kdeinitdir, '$(kde_moduledir)') AC_SUBST(tdeinitdir, '$(kde_moduledir)')
AC_SUBST(kde_styledir) AC_SUBST(kde_styledir)
AC_SUBST(kde_widgetdir) AC_SUBST(kde_widgetdir)
if test "$kde_qtver" = 1; then if test "$kde_qtver" = 1; then
@ -937,7 +937,7 @@ mips-sgi-irix6*)
ac_x_includes="." ac_x_includes="."
fi fi
if test -z "$ac_x_libraries"; then if test -z "$ac_x_libraries"; then
ac_x_libraries="/usr/lib${kdelibsuff}" ac_x_libraries="/usr/lib${tdelibsuff}"
fi fi
esac esac
#from now on we use our own again #from now on we use our own again
@ -1418,7 +1418,7 @@ qt_includes=""
AC_ARG_WITH(qt-dir, AC_ARG_WITH(qt-dir,
AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]), AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]),
[ ac_qt_includes="$withval"/include [ ac_qt_includes="$withval"/include
ac_qt_libraries="$withval"/lib${kdelibsuff} ac_qt_libraries="$withval"/lib${tdelibsuff}
ac_qt_bindir="$withval"/bin ac_qt_bindir="$withval"/bin
]) ])
@ -1459,7 +1459,7 @@ ac_qt_includes="$qt_incdir"
qt_libdirs="" qt_libdirs=""
for dir in $kde_qt_dirs; do for dir in $kde_qt_dirs; do
qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir" qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir"
done done
qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
if test ! "$ac_qt_libraries" = "NO"; then if test ! "$ac_qt_libraries" = "NO"; then
@ -1644,11 +1644,11 @@ rm -f actest.ui actest.cpp
AC_MSG_RESULT([$kde_cv_uic_plugins]) AC_MSG_RESULT([$kde_cv_uic_plugins])
if test "$kde_cv_uic_plugins" != yes; then if test "$kde_cv_uic_plugins" != yes; then
AC_MSG_ERROR([ AC_MSG_ERROR([
you need to install kdelibs first. you need to install tdelibs first.
If you did install kdelibs, then the Qt version that is picked up by If you did install tdelibs, then the Qt version that is picked up by
this configure is not the same version you used to compile kdelibs. this configure is not the same version you used to compile tdelibs.
The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the
_same Qt version_, compiled with the _same compiler_ and the same Qt _same Qt version_, compiled with the _same compiler_ and the same Qt
configuration settings. configuration settings.
]) ])
@ -1785,16 +1785,16 @@ AC_CACHE_VAL(ac_cv_have_kde,
if test "$kde_qtver" = 1; then if test "$kde_qtver" = 1; then
kde_check_header="ksock.h" kde_check_header="ksock.h"
kde_check_lib="libkdecore.la" kde_check_lib="libtdecore.la"
else else
kde_check_header="ksharedptr.h" kde_check_header="ksharedptr.h"
kde_check_lib="libkio.la" kde_check_lib="libtdeio.la"
fi fi
if test -z "$1"; then if test -z "$1"; then
kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs" test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs"
kde_incdirs="$ac_kde_includes $kde_incdirs" kde_incdirs="$ac_kde_includes $kde_incdirs"
AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir) AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
ac_kde_includes="$kde_incdir" ac_kde_includes="$kde_incdir"
@ -1805,15 +1805,15 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail.
So, check this please and use another prefix!]) So, check this please and use another prefix!])
fi fi
kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}"
test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs" test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs"
kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir) AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
ac_kde_libraries="$kde_libdir" ac_kde_libraries="$kde_libdir"
kde_widgetdir=NO kde_widgetdir=NO
dnl this might be somewhere else dnl this might be somewhere else
AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir) AC_FIND_FILE("kde3/plugins/designer/tdewidgets.la", $kde_libdirs, kde_widgetdir)
if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
AC_MSG_ERROR([ AC_MSG_ERROR([
@ -1821,10 +1821,10 @@ in the prefix, you've chosen, are no KDE libraries installed. This will fail.
So, check this please and use another prefix!]) So, check this please and use another prefix!])
fi fi
if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/tdewidgets.la"; then
AC_MSG_ERROR([ AC_MSG_ERROR([
I can't find the designer plugins. These are required and should have been installed I can't find the designer plugins. These are required and should have been installed
by kdelibs]) by tdelibs])
fi fi
if test -n "$kde_widgetdir"; then if test -n "$kde_widgetdir"; then
@ -1839,7 +1839,7 @@ else
ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries" ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
fi fi
else dnl test -z $1, e.g. from kdelibs else dnl test -z $1, e.g. from tdelibs
ac_cv_have_kde="have_kde=no" ac_cv_have_kde="have_kde=no"
@ -1979,20 +1979,20 @@ cat > conftest.$ac_ext <<EOF
#include <kapp.h> #include <kapp.h>
int main() { int main() {
printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data()); printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data()); printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data()); printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data()); printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data()); printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data()); printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data()); printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data()); printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data()); printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data()); printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
printf("kde_wallpaperdir=\\"%s\\"\n", printf("kde_wallpaperdir=\\"%s\\"\n",
KApplication::kde_wallpaperdir().data()); TDEApplication::kde_wallpaperdir().data());
printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data()); printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data()); printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
printf("kde_servicesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
printf("kde_moduledir=\\"/tmp/dummy\\"\n"); printf("kde_moduledir=\\"/tmp/dummy\\"\n");
@ -2030,7 +2030,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
kde_cxxflags_safe="$CXXFLAGS" kde_cxxflags_safe="$CXXFLAGS"
LIBS="-lkde-qt-addon $LIBQT $LIBS" LIBS="-lkde-qt-addon $LIBQT $LIBS"
CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes" CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes"
LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS" LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
AC_TRY_LINK([ AC_TRY_LINK([
@ -2064,48 +2064,48 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
if test $kde_qtver = 3; then if test $kde_qtver = 3; then
case $host in case $host in
*cygwin*) lib_kded="-lkdeinit_kded" ;; *cygwin*) lib_kded="-ltdeinit_kded" ;;
*) lib_kded="" ;; *) lib_kded="" ;;
esac esac
AC_SUBST(LIB_KDED, $lib_kded) AC_SUBST(LIB_KDED, $lib_kded)
AC_SUBST(LIB_KDECORE, "-lkdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_KDEUI, "-lkdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lkabc") AC_SUBST(LIB_KABC, "-ltdeabc")
AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_KDEPRINT, "-lkdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-lkutils") AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
AC_SUBST(LIB_KDEPIM, "-lkdepim") AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-lkimproxy") AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-lkdnssd") AC_SUBST(LIB_TDEDNSSD, "-ltdednssd")
AC_SUBST(LIB_KUNITTEST, "-lkunittest") AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest")
# these are for backward compatibility # these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-lkio") AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
AC_SUBST(LIB_KFILE, "-lkio") AC_SUBST(LIB_KFILE, "-ltdeio")
elif test $kde_qtver = 2; then elif test $kde_qtver = 2; then
AC_SUBST(LIB_KDECORE, "-lkdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_KDEUI, "-lkdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_KSYCOCA, "-lksycoca") AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-lkfile") AC_SUBST(LIB_KFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_KDEPRINT, "-lkdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else else
AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)") AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
fi fi
]) ])
@ -2170,7 +2170,7 @@ if test "x$kde_cv_func_$1" = xyes; then
else else
case "$1" in case "$1" in
setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat) setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
kde_cv_proto_$1="yes - in libkdefakes" kde_cv_proto_$1="yes - in libtdefakes"
;; ;;
*) *)
kde_cv_proto_$1=unknown kde_cv_proto_$1=unknown
@ -2489,7 +2489,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif]) AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
else else
AC_MSG_ERROR(You need giflib30. Please install the kdesupport package) AC_MSG_ERROR(You need giflib30. Please install the tdesupport package)
fi fi
]) ])
@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
test "x$jpeg_incdir" = xNO && jpeg_incdir= test "x$jpeg_incdir" = xNO && jpeg_incdir=
dnl if headers _and_ libraries are missing, this is no error, and we dnl if headers _and_ libraries are missing, this is no error, and we
dnl continue with a warning (the user will get no jpeg support in khtml) dnl continue with a warning (the user will get no jpeg support in tdehtml)
dnl if only one is missing, it means a configuration error, but we still dnl if only one is missing, it means a configuration error, but we still
dnl only warn dnl only warn
if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)" KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
AC_SUBST(KDE_PLUGIN) AC_SUBST(KDE_PLUGIN)
# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs. # This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)" KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
AC_SUBST(KDE_CHECK_PLUGIN) AC_SUBST(KDE_CHECK_PLUGIN)
@ -3499,16 +3499,16 @@ AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch config
AC_DEFUN([KDE_CHECK_LIB64], AC_DEFUN([KDE_CHECK_LIB64],
[ [
kdelibsuff="$kde_libs_suffix" tdelibsuff="$kde_libs_suffix"
if test -z "$kdelibsuff"; then if test -z "$tdelibsuff"; then
kdelibsuff="no" tdelibsuff="no"
fi fi
AC_ARG_ENABLE(libsuffix, AC_ARG_ENABLE(libsuffix,
AC_HELP_STRING([--enable-libsuffix], AC_HELP_STRING([--enable-libsuffix],
[/lib directory suffix (64,32,none,auto[=default])]), [/lib directory suffix (64,32,none,auto[=default])]),
kdelibsuff=$enableval) tdelibsuff=$enableval)
if test "$kdelibsuff" = "auto"; then if test "$tdelibsuff" = "auto"; then
cat > conftest.c << EOF cat > conftest.c << EOF
#include <stdio.h> #include <stdio.h>
@ -3516,26 +3516,26 @@ int main() {
return 0; return 0;
} }
EOF EOF
kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ tdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
s,.*/lib\([[^\/]]*\)/.*,\1, s,.*/lib\([[^\/]]*\)/.*,\1,
p p
}'` }'`
rm -rf conftest.* rm -rf conftest.*
fi fi
if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then if test "$tdelibsuff" = "no" || test "$tdelibsuff" = "none"; then
kdelibsuff= tdelibsuff=
fi fi
if test -z "$kdelibsuff"; then if test -z "$tdelibsuff"; then
AC_MSG_RESULT([not using lib directory suffix]) AC_MSG_RESULT([not using lib directory suffix])
AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories) AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories)
else else
if test "$libdir" = '${exec_prefix}/lib'; then if test "$libdir" = '${exec_prefix}/lib'; then
libdir="$libdir${kdelibsuff}" libdir="$libdir${tdelibsuff}"
AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms
fi fi
AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${kdelibsuff}"], Suffix for lib directories) AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${tdelibsuff}"], Suffix for lib directories)
AC_MSG_RESULT([using lib directory suffix $kdelibsuff]) AC_MSG_RESULT([using lib directory suffix $tdelibsuff])
fi fi
]) ])
@ -3553,7 +3553,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
@ -4560,7 +4560,7 @@ fi
PYTHONINC=-I$python_incdir PYTHONINC=-I$python_incdir
python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs" python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs"
AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir) AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir)
if test ! -r $python_libdir/libpython$version.so; then if test ! -r $python_libdir/libpython$version.so; then
AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir) AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)
@ -4948,14 +4948,14 @@ AC_DEFUN([KDE_CONF_FILES],
AC_SUBST(CONF_FILES) AC_SUBST(CONF_FILES)
])dnl ])dnl
dnl This sets the prefix, for arts and kdelibs dnl This sets the prefix, for arts and tdelibs
dnl Do NOT use in any other module. dnl Do NOT use in any other module.
dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde dnl It only looks at --prefix, TDEDIR and falls back to /usr/local/kde
AC_DEFUN([KDE_SET_PREFIX_CORE], AC_DEFUN([KDE_SET_PREFIX_CORE],
[ [
unset CDPATH unset CDPATH
dnl make $KDEDIR the default for the installation dnl make $TDEDIR the default for the installation
AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
if test "x$prefix" = "xNONE"; then if test "x$prefix" = "xNONE"; then
prefix=$ac_default_prefix prefix=$ac_default_prefix
@ -4979,25 +4979,25 @@ AC_DEFUN([KDE_SET_PREFIX],
unset CDPATH unset CDPATH
dnl We can't give real code to that macro, only a value. dnl We can't give real code to that macro, only a value.
dnl It only matters for --help, since we set the prefix in this function anyway. dnl It only matters for --help, since we set the prefix in this function anyway.
AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix}) AC_PREFIX_DEFAULT(${TDEDIR:-the kde prefix})
KDE_SET_DEFAULT_BINDIRS KDE_SET_DEFAULT_BINDIRS
if test "x$prefix" = "xNONE"; then if test "x$prefix" = "xNONE"; then
dnl no prefix given: look for kde-config in the PATH and deduce the prefix from it dnl no prefix given: look for tde-config in the PATH and deduce the prefix from it
KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend) KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend)
else else
dnl prefix given: look for kde-config, preferrably in prefix, otherwise in PATH dnl prefix given: look for tde-config, preferrably in prefix, otherwise in PATH
kde_save_PATH="$PATH" kde_save_PATH="$PATH"
PATH="$exec_prefix/bin:$prefix/bin:$PATH" PATH="$exec_prefix/bin:$prefix/bin:$PATH"
KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend) KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend)
PATH="$kde_save_PATH" PATH="$kde_save_PATH"
fi fi
kde_libs_prefix=`$KDECONFIG --prefix` kde_libs_prefix=`$KDECONFIG --prefix`
if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs. AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs.
This means it has been moved since you installed it. This means it has been moved since you installed it.
This won't work. Please recompile kdelibs for the new prefix. This won't work. Please recompile tdelibs for the new prefix.
]) ])
fi fi
kde_libs_htmldir=`$KDECONFIG --install html --expandvars` kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
@ -5006,7 +5006,7 @@ AC_DEFUN([KDE_SET_PREFIX],
AC_MSG_CHECKING([where to install]) AC_MSG_CHECKING([where to install])
if test "x$prefix" = "xNONE"; then if test "x$prefix" = "xNONE"; then
prefix=$kde_libs_prefix prefix=$kde_libs_prefix
AC_MSG_RESULT([$prefix (as returned by kde-config)]) AC_MSG_RESULT([$prefix (as returned by tde-config)])
else else
dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different
given_prefix=$prefix given_prefix=$prefix
@ -5663,7 +5663,7 @@ ssl_includes=""
AC_ARG_WITH(ssl-dir, AC_ARG_WITH(ssl-dir,
AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]), AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]),
[ ac_ssl_includes="$withval"/include [ ac_ssl_includes="$withval"/include
ac_ssl_libraries="$withval"/lib$kdelibsuff ac_ssl_libraries="$withval"/lib$tdelibsuff
]) ])
want_ssl=yes want_ssl=yes
@ -5683,7 +5683,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
@ -5920,9 +5920,9 @@ dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page
dnl also defines KSTUFF_PKG_ERRORS on error dnl also defines KSTUFF_PKG_ERRORS on error
AC_DEFUN([KDE_PKG_CHECK_MODULES], [ AC_DEFUN([KDE_PKG_CHECK_MODULES], [
PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" PKG_CONFIG_PATH="$prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
if test "$prefix" != "$kde_libs_prefix"; then if test "$prefix" != "$kde_libs_prefix"; then
PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" PKG_CONFIG_PATH="$kde_libs_prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
fi fi
export PKG_CONFIG_PATH export PKG_CONFIG_PATH
PKG_CHECK_MODULES([$1],[$2],[$3],[$4]) PKG_CHECK_MODULES([$1],[$2],[$3],[$4])

276
admin/acinclude.m4.in
Unescape View File

@ -23,8 +23,8 @@ dnl IMPORTANT NOTE:
dnl Please do not modify this file unless you expect your modifications to be dnl Please do not modify this file unless you expect your modifications to be
dnl carried into every other module in the repository. dnl carried into every other module in the repository.
dnl dnl
dnl Single-module modifications are best placed in configure.in for kdelibs dnl Single-module modifications are best placed in configure.in for tdelibs
dnl and kdebase or configure.in.in if present. dnl and tdebase or configure.in.in if present.
# KDE_PATH_X_DIRECT # KDE_PATH_X_DIRECT
dnl Internal subroutine of AC_PATH_X. dnl Internal subroutine of AC_PATH_X.
@ -103,41 +103,41 @@ ac_x_libraries=],
[LIBS="$ac_save_LIBS" [LIBS="$ac_save_LIBS"
# First see if replacing the include by lib works. # First see if replacing the include by lib works.
# Check X11 before X11Rn because it is often a symlink to the current release. # Check X11 before X11Rn because it is often a symlink to the current release.
for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \ for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \
/usr/X11/lib${kdelibsuff} \ /usr/X11/lib${tdelibsuff} \
/usr/X11R6/lib${kdelibsuff} \ /usr/X11R6/lib${tdelibsuff} \
/usr/X11R5/lib${kdelibsuff} \ /usr/X11R5/lib${tdelibsuff} \
/usr/X11R4/lib${kdelibsuff} \ /usr/X11R4/lib${tdelibsuff} \
\ \
/usr/lib${kdelibsuff}/X11 \ /usr/lib${tdelibsuff}/X11 \
/usr/lib${kdelibsuff}/X11R6 \ /usr/lib${tdelibsuff}/X11R6 \
/usr/lib${kdelibsuff}/X11R5 \ /usr/lib${tdelibsuff}/X11R5 \
/usr/lib${kdelibsuff}/X11R4 \ /usr/lib${tdelibsuff}/X11R4 \
\ \
/usr/local/X11/lib${kdelibsuff} \ /usr/local/X11/lib${tdelibsuff} \
/usr/local/X11R6/lib${kdelibsuff} \ /usr/local/X11R6/lib${tdelibsuff} \
/usr/local/X11R5/lib${kdelibsuff} \ /usr/local/X11R5/lib${tdelibsuff} \
/usr/local/X11R4/lib${kdelibsuff} \ /usr/local/X11R4/lib${tdelibsuff} \
\ \
/usr/local/lib${kdelibsuff}/X11 \ /usr/local/lib${tdelibsuff}/X11 \
/usr/local/lib${kdelibsuff}/X11R6 \ /usr/local/lib${tdelibsuff}/X11R6 \
/usr/local/lib${kdelibsuff}/X11R5 \ /usr/local/lib${tdelibsuff}/X11R5 \
/usr/local/lib${kdelibsuff}/X11R4 \ /usr/local/lib${tdelibsuff}/X11R4 \
\ \
/usr/X386/lib${kdelibsuff} \ /usr/X386/lib${tdelibsuff} \
/usr/x386/lib${kdelibsuff} \ /usr/x386/lib${tdelibsuff} \
/usr/XFree86/lib${kdelibsuff}/X11 \ /usr/XFree86/lib${tdelibsuff}/X11 \
\ \
/usr/lib${kdelibsuff} \ /usr/lib${tdelibsuff} \
/usr/local/lib${kdelibsuff} \ /usr/local/lib${tdelibsuff} \
/usr/unsupported/lib${kdelibsuff} \ /usr/unsupported/lib${tdelibsuff} \
/usr/athena/lib${kdelibsuff} \ /usr/athena/lib${tdelibsuff} \
/usr/local/x11r5/lib${kdelibsuff} \ /usr/local/x11r5/lib${tdelibsuff} \
/usr/lpp/Xamples/lib${kdelibsuff} \ /usr/lpp/Xamples/lib${tdelibsuff} \
/lib/usr/lib${kdelibsuff}/X11 \ /lib/usr/lib${tdelibsuff}/X11 \
\ \
/usr/openwin/lib${kdelibsuff} \ /usr/openwin/lib${tdelibsuff} \
/usr/openwin/share/lib${kdelibsuff} \ /usr/openwin/share/lib${tdelibsuff} \
; \ ; \
do do
dnl Don't even attempt the hair of trying to link an X program! dnl Don't even attempt the hair of trying to link an X program!
@ -371,24 +371,24 @@ AC_DEFUN([KDE_1_CHECK_PATHS],
fi fi
AC_MSG_CHECKING([for KDE libraries installed]) AC_MSG_CHECKING([for KDE libraries installed])
ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5' ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5'
if AC_TRY_EVAL(ac_link) && test -s conftest; then if AC_TRY_EVAL(ac_link) && test -s conftest; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
else else
AC_MSG_ERROR([your system fails at linking a small KDE application! AC_MSG_ERROR([your system fails at linking a small KDE application!
Check, if your compiler is installed correctly and if you have used the Check, if your compiler is installed correctly and if you have used the
same compiler to compile Qt and kdelibs as you did use now. same compiler to compile Qt and tdelibs as you did use now.
For more details about this problem, look at the end of config.log.]) For more details about this problem, look at the end of config.log.])
fi fi
if eval `KDEDIR= ./conftest 2>&5`; then if eval `TDEDIR= ./conftest 2>&5`; then
kde_result=done kde_result=done
else else
kde_result=problems kde_result=problems
fi fi
KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
kde_have_all_paths=yes kde_have_all_paths=yes
KDE_SET_PATHS($kde_result) KDE_SET_PATHS($kde_result)
@ -547,11 +547,11 @@ Please check whether you installed aRts correctly or use
AC_DEFUN([KDE_SET_DEFAULT_BINDIRS], AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
[ [
kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin" kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs" test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
if test -n "$KDEDIRS"; then if test -n "$TDEDIRS"; then
kde_save_IFS=$IFS kde_save_IFS=$IFS
IFS=: IFS=:
for dir in $KDEDIRS; do for dir in $TDEDIRS; do
kde_default_bindirs="$dir/bin $kde_default_bindirs " kde_default_bindirs="$dir/bin $kde_default_bindirs "
done done
IFS=$kde_save_IFS IFS=$kde_save_IFS
@ -602,18 +602,18 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi fi
if test -n "$kde32ornewer"; then if test -n "$kde32ornewer"; then
KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)]) KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
fi fi
if test -n "$kde33ornewer"; then if test -n "$kde33ornewer"; then
KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)]) KDE_FIND_PATH(maketdewidgets, MAKETDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(maketdewidgets)])
AC_SUBST(MAKEKDEWIDGETS) AC_SUBST(MAKETDEWIDGETS)
fi fi
KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""]) KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share" kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs" test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs"
AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET) AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
if test "$KDE_XSL_STYLESHEET" = "NO"; then if test "$KDE_XSL_STYLESHEET" = "NO"; then
KDE_XSL_STYLESHEET="" KDE_XSL_STYLESHEET=""
@ -710,7 +710,7 @@ AC_SUBST(kde_templatesdir)
AC_SUBST(kde_servicesdir) AC_SUBST(kde_servicesdir)
AC_SUBST(kde_servicetypesdir) AC_SUBST(kde_servicetypesdir)
AC_SUBST(kde_moduledir) AC_SUBST(kde_moduledir)
AC_SUBST(kdeinitdir, '$(kde_moduledir)') AC_SUBST(tdeinitdir, '$(kde_moduledir)')
AC_SUBST(kde_styledir) AC_SUBST(kde_styledir)
AC_SUBST(kde_widgetdir) AC_SUBST(kde_widgetdir)
if test "$kde_qtver" = 1; then if test "$kde_qtver" = 1; then
@ -937,7 +937,7 @@ mips-sgi-irix6*)
ac_x_includes="." ac_x_includes="."
fi fi
if test -z "$ac_x_libraries"; then if test -z "$ac_x_libraries"; then
ac_x_libraries="/usr/lib${kdelibsuff}" ac_x_libraries="/usr/lib${tdelibsuff}"
fi fi
esac esac
#from now on we use our own again #from now on we use our own again
@ -1418,7 +1418,7 @@ qt_includes=""
AC_ARG_WITH(qt-dir, AC_ARG_WITH(qt-dir,
AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]), AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]),
[ ac_qt_includes="$withval"/include [ ac_qt_includes="$withval"/include
ac_qt_libraries="$withval"/lib${kdelibsuff} ac_qt_libraries="$withval"/lib${tdelibsuff}
ac_qt_bindir="$withval"/bin ac_qt_bindir="$withval"/bin
]) ])
@ -1459,7 +1459,7 @@ ac_qt_includes="$qt_incdir"
qt_libdirs="" qt_libdirs=""
for dir in $kde_qt_dirs; do for dir in $kde_qt_dirs; do
qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir" qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir"
done done
qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
if test ! "$ac_qt_libraries" = "NO"; then if test ! "$ac_qt_libraries" = "NO"; then
@ -1644,11 +1644,11 @@ rm -f actest.ui actest.cpp
AC_MSG_RESULT([$kde_cv_uic_plugins]) AC_MSG_RESULT([$kde_cv_uic_plugins])
if test "$kde_cv_uic_plugins" != yes; then if test "$kde_cv_uic_plugins" != yes; then
AC_MSG_ERROR([ AC_MSG_ERROR([
you need to install kdelibs first. you need to install tdelibs first.
If you did install kdelibs, then the Qt version that is picked up by If you did install tdelibs, then the Qt version that is picked up by
this configure is not the same version you used to compile kdelibs. this configure is not the same version you used to compile tdelibs.
The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the
_same Qt version_, compiled with the _same compiler_ and the same Qt _same Qt version_, compiled with the _same compiler_ and the same Qt
configuration settings. configuration settings.
]) ])
@ -1785,16 +1785,16 @@ AC_CACHE_VAL(ac_cv_have_kde,
if test "$kde_qtver" = 1; then if test "$kde_qtver" = 1; then
kde_check_header="ksock.h" kde_check_header="ksock.h"
kde_check_lib="libkdecore.la" kde_check_lib="libtdecore.la"
else else
kde_check_header="ksharedptr.h" kde_check_header="ksharedptr.h"
kde_check_lib="libkio.la" kde_check_lib="libtdeio.la"
fi fi
if test -z "$1"; then if test -z "$1"; then
kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs" test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs"
kde_incdirs="$ac_kde_includes $kde_incdirs" kde_incdirs="$ac_kde_includes $kde_incdirs"
AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir) AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
ac_kde_includes="$kde_incdir" ac_kde_includes="$kde_incdir"
@ -1805,15 +1805,15 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail.
So, check this please and use another prefix!]) So, check this please and use another prefix!])
fi fi
kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}"
test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs" test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs"
kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir) AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
ac_kde_libraries="$kde_libdir" ac_kde_libraries="$kde_libdir"
kde_widgetdir=NO kde_widgetdir=NO
dnl this might be somewhere else dnl this might be somewhere else
AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir) AC_FIND_FILE("kde3/plugins/designer/tdewidgets.la", $kde_libdirs, kde_widgetdir)
if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
AC_MSG_ERROR([ AC_MSG_ERROR([
@ -1821,10 +1821,10 @@ in the prefix, you've chosen, are no KDE libraries installed. This will fail.
So, check this please and use another prefix!]) So, check this please and use another prefix!])
fi fi
if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/tdewidgets.la"; then
AC_MSG_ERROR([ AC_MSG_ERROR([
I can't find the designer plugins. These are required and should have been installed I can't find the designer plugins. These are required and should have been installed
by kdelibs]) by tdelibs])
fi fi
if test -n "$kde_widgetdir"; then if test -n "$kde_widgetdir"; then
@ -1839,7 +1839,7 @@ else
ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries" ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
fi fi
else dnl test -z $1, e.g. from kdelibs else dnl test -z $1, e.g. from tdelibs
ac_cv_have_kde="have_kde=no" ac_cv_have_kde="have_kde=no"
@ -1979,20 +1979,20 @@ cat > conftest.$ac_ext <<EOF
#include <kapp.h> #include <kapp.h>
int main() { int main() {
printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data()); printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data()); printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data()); printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data()); printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data()); printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data()); printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data()); printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data()); printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data()); printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data()); printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
printf("kde_wallpaperdir=\\"%s\\"\n", printf("kde_wallpaperdir=\\"%s\\"\n",
KApplication::kde_wallpaperdir().data()); TDEApplication::kde_wallpaperdir().data());
printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data()); printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data()); printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
printf("kde_servicesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
printf("kde_moduledir=\\"/tmp/dummy\\"\n"); printf("kde_moduledir=\\"/tmp/dummy\\"\n");
@ -2030,7 +2030,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
kde_cxxflags_safe="$CXXFLAGS" kde_cxxflags_safe="$CXXFLAGS"
LIBS="-lkde-qt-addon $LIBQT $LIBS" LIBS="-lkde-qt-addon $LIBQT $LIBS"
CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes" CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes"
LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS" LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
AC_TRY_LINK([ AC_TRY_LINK([
@ -2064,48 +2064,48 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
if test $kde_qtver = 3; then if test $kde_qtver = 3; then
case $host in case $host in
*cygwin*) lib_kded="-lkdeinit_kded" ;; *cygwin*) lib_kded="-ltdeinit_kded" ;;
*) lib_kded="" ;; *) lib_kded="" ;;
esac esac
AC_SUBST(LIB_KDED, $lib_kded) AC_SUBST(LIB_KDED, $lib_kded)
AC_SUBST(LIB_KDECORE, "-lkdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_KDEUI, "-lkdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lkabc") AC_SUBST(LIB_KABC, "-ltdeabc")
AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_KDEPRINT, "-lkdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-lkutils") AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
AC_SUBST(LIB_KDEPIM, "-lkdepim") AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-lkimproxy") AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-lkdnssd") AC_SUBST(LIB_TDEDNSSD, "-ltdednssd")
AC_SUBST(LIB_KUNITTEST, "-lkunittest") AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest")
# these are for backward compatibility # these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-lkio") AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
AC_SUBST(LIB_KFILE, "-lkio") AC_SUBST(LIB_KFILE, "-ltdeio")
elif test $kde_qtver = 2; then elif test $kde_qtver = 2; then
AC_SUBST(LIB_KDECORE, "-lkdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_KDEUI, "-lkdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_KSYCOCA, "-lksycoca") AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-lkfile") AC_SUBST(LIB_KFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_KDEPRINT, "-lkdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else else
AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)") AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
fi fi
]) ])
@ -2170,7 +2170,7 @@ if test "x$kde_cv_func_$1" = xyes; then
else else
case "$1" in case "$1" in
setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat) setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
kde_cv_proto_$1="yes - in libkdefakes" kde_cv_proto_$1="yes - in libtdefakes"
;; ;;
*) *)
kde_cv_proto_$1=unknown kde_cv_proto_$1=unknown
@ -2489,7 +2489,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif]) AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
else else
AC_MSG_ERROR(You need giflib30. Please install the kdesupport package) AC_MSG_ERROR(You need giflib30. Please install the tdesupport package)
fi fi
]) ])
@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
test "x$jpeg_incdir" = xNO && jpeg_incdir= test "x$jpeg_incdir" = xNO && jpeg_incdir=
dnl if headers _and_ libraries are missing, this is no error, and we dnl if headers _and_ libraries are missing, this is no error, and we
dnl continue with a warning (the user will get no jpeg support in khtml) dnl continue with a warning (the user will get no jpeg support in tdehtml)
dnl if only one is missing, it means a configuration error, but we still dnl if only one is missing, it means a configuration error, but we still
dnl only warn dnl only warn
if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)" KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
AC_SUBST(KDE_PLUGIN) AC_SUBST(KDE_PLUGIN)
# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs. # This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)" KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
AC_SUBST(KDE_CHECK_PLUGIN) AC_SUBST(KDE_CHECK_PLUGIN)
@ -3499,16 +3499,16 @@ AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch config
AC_DEFUN([KDE_CHECK_LIB64], AC_DEFUN([KDE_CHECK_LIB64],
[ [
kdelibsuff="$kde_libs_suffix" tdelibsuff="$kde_libs_suffix"
if test -z "$kdelibsuff"; then if test -z "$tdelibsuff"; then
kdelibsuff="no" tdelibsuff="no"
fi fi
AC_ARG_ENABLE(libsuffix, AC_ARG_ENABLE(libsuffix,
AC_HELP_STRING([--enable-libsuffix], AC_HELP_STRING([--enable-libsuffix],
[/lib directory suffix (64,32,none,auto[=default])]), [/lib directory suffix (64,32,none,auto[=default])]),
kdelibsuff=$enableval) tdelibsuff=$enableval)
if test "$kdelibsuff" = "auto"; then if test "$tdelibsuff" = "auto"; then
cat > conftest.c << EOF cat > conftest.c << EOF
#include <stdio.h> #include <stdio.h>
@ -3516,26 +3516,26 @@ int main() {
return 0; return 0;
} }
EOF EOF
kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ tdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
s,.*/lib\([[^\/]]*\)/.*,\1, s,.*/lib\([[^\/]]*\)/.*,\1,
p p
}'` }'`
rm -rf conftest.* rm -rf conftest.*
fi fi
if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then if test "$tdelibsuff" = "no" || test "$tdelibsuff" = "none"; then
kdelibsuff= tdelibsuff=
fi fi
if test -z "$kdelibsuff"; then if test -z "$tdelibsuff"; then
AC_MSG_RESULT([not using lib directory suffix]) AC_MSG_RESULT([not using lib directory suffix])
AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories) AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories)
else else
if test "$libdir" = '${exec_prefix}/lib'; then if test "$libdir" = '${exec_prefix}/lib'; then
libdir="$libdir${kdelibsuff}" libdir="$libdir${tdelibsuff}"
AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms
fi fi
AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${kdelibsuff}"], Suffix for lib directories) AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${tdelibsuff}"], Suffix for lib directories)
AC_MSG_RESULT([using lib directory suffix $kdelibsuff]) AC_MSG_RESULT([using lib directory suffix $tdelibsuff])
fi fi
]) ])
@ -3553,7 +3553,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
@ -4560,7 +4560,7 @@ fi
PYTHONINC=-I$python_incdir PYTHONINC=-I$python_incdir
python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs" python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs"
AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir) AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir)
if test ! -r $python_libdir/libpython$version.so; then if test ! -r $python_libdir/libpython$version.so; then
AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir) AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)
@ -4948,14 +4948,14 @@ AC_DEFUN([KDE_CONF_FILES],
AC_SUBST(CONF_FILES) AC_SUBST(CONF_FILES)
])dnl ])dnl
dnl This sets the prefix, for arts and kdelibs dnl This sets the prefix, for arts and tdelibs
dnl Do NOT use in any other module. dnl Do NOT use in any other module.
dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde dnl It only looks at --prefix, TDEDIR and falls back to /usr/local/kde
AC_DEFUN([KDE_SET_PREFIX_CORE], AC_DEFUN([KDE_SET_PREFIX_CORE],
[ [
unset CDPATH unset CDPATH
dnl make $KDEDIR the default for the installation dnl make $TDEDIR the default for the installation
AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
if test "x$prefix" = "xNONE"; then if test "x$prefix" = "xNONE"; then
prefix=$ac_default_prefix prefix=$ac_default_prefix
@ -4979,25 +4979,25 @@ AC_DEFUN([KDE_SET_PREFIX],
unset CDPATH unset CDPATH
dnl We can't give real code to that macro, only a value. dnl We can't give real code to that macro, only a value.
dnl It only matters for --help, since we set the prefix in this function anyway. dnl It only matters for --help, since we set the prefix in this function anyway.
AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix}) AC_PREFIX_DEFAULT(${TDEDIR:-the kde prefix})
KDE_SET_DEFAULT_BINDIRS KDE_SET_DEFAULT_BINDIRS
if test "x$prefix" = "xNONE"; then if test "x$prefix" = "xNONE"; then
dnl no prefix given: look for kde-config in the PATH and deduce the prefix from it dnl no prefix given: look for tde-config in the PATH and deduce the prefix from it
KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend) KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend)
else else
dnl prefix given: look for kde-config, preferrably in prefix, otherwise in PATH dnl prefix given: look for tde-config, preferrably in prefix, otherwise in PATH
kde_save_PATH="$PATH" kde_save_PATH="$PATH"
PATH="$exec_prefix/bin:$prefix/bin:$PATH" PATH="$exec_prefix/bin:$prefix/bin:$PATH"
KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend) KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend)
PATH="$kde_save_PATH" PATH="$kde_save_PATH"
fi fi
kde_libs_prefix=`$KDECONFIG --prefix` kde_libs_prefix=`$KDECONFIG --prefix`
if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs. AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs.
This means it has been moved since you installed it. This means it has been moved since you installed it.
This won't work. Please recompile kdelibs for the new prefix. This won't work. Please recompile tdelibs for the new prefix.
]) ])
fi fi
kde_libs_htmldir=`$KDECONFIG --install html --expandvars` kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
@ -5006,7 +5006,7 @@ AC_DEFUN([KDE_SET_PREFIX],
AC_MSG_CHECKING([where to install]) AC_MSG_CHECKING([where to install])
if test "x$prefix" = "xNONE"; then if test "x$prefix" = "xNONE"; then
prefix=$kde_libs_prefix prefix=$kde_libs_prefix
AC_MSG_RESULT([$prefix (as returned by kde-config)]) AC_MSG_RESULT([$prefix (as returned by tde-config)])
else else
dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different
given_prefix=$prefix given_prefix=$prefix
@ -5663,7 +5663,7 @@ ssl_includes=""
AC_ARG_WITH(ssl-dir, AC_ARG_WITH(ssl-dir,
AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]), AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]),
[ ac_ssl_includes="$withval"/include [ ac_ssl_includes="$withval"/include
ac_ssl_libraries="$withval"/lib$kdelibsuff ac_ssl_libraries="$withval"/lib$tdelibsuff
]) ])
want_ssl=yes want_ssl=yes
@ -5683,7 +5683,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
@ -5920,9 +5920,9 @@ dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page
dnl also defines KSTUFF_PKG_ERRORS on error dnl also defines KSTUFF_PKG_ERRORS on error
AC_DEFUN([KDE_PKG_CHECK_MODULES], [ AC_DEFUN([KDE_PKG_CHECK_MODULES], [
PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" PKG_CONFIG_PATH="$prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
if test "$prefix" != "$kde_libs_prefix"; then if test "$prefix" != "$kde_libs_prefix"; then
PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" PKG_CONFIG_PATH="$kde_libs_prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
fi fi
export PKG_CONFIG_PATH export PKG_CONFIG_PATH
PKG_CHECK_MODULES([$1],[$2],[$3],[$4]) PKG_CHECK_MODULES([$1],[$2],[$3],[$4])

150
admin/am_edit
Unescape View File

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

2
admin/config.pl
Unescape View File

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

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

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

6
admin/cvs.sh
Unescape View File

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

2
admin/debianrules
Unescape View File

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

2
admin/doxygen.sh
Unescape View File

@ -3,7 +3,7 @@
# doxygen.sh Copyright (C) 2005 by Adriaan de Groot # doxygen.sh Copyright (C) 2005 by Adriaan de Groot
# Based on some code from Doxyfile.am, among other things. # Based on some code from Doxyfile.am, among other things.
# License: GPL version 2. # License: GPL version 2.
# See file COPYING in kdelibs for details. # See file COPYING in tdelibs for details.
echo "*** doxygen.sh" echo "*** doxygen.sh"

412
configure vendored
Unescape View File

@ -426,7 +426,7 @@ PACKAGE_STRING=
PACKAGE_BUGREPORT= PACKAGE_BUGREPORT=
ac_unique_file="acinclude.m4" ac_unique_file="acinclude.m4"
ac_default_prefix=${KDEDIR:-the kde prefix} ac_default_prefix=${TDEDIR:-the kde prefix}
# Factoring default headers for most tests. # Factoring default headers for most tests.
ac_includes_default="\ ac_includes_default="\
#include <stdio.h> #include <stdio.h>
@ -464,7 +464,7 @@ ac_includes_default="\
# include <unistd.h> # include <unistd.h>
#endif" #endif"
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM TOPSUBDIRS LIBOBJS LTLIBOBJS' ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKETDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir tdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_TDECORE LIB_TDEUI LIB_TDEIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_TDEHTML LIB_TDESPELL LIB_TDEPARTS LIB_TDEPRINT LIB_TDEUTILS LIB_TDEPIM LIB_TDEIMPROXY LIB_KNEWSTUFF LIB_TDEDNSSD LIB_TDEUNITTEST LIB_TDESYCOCA LIB_KFILE LIB_KFM TOPSUBDIRS LIBOBJS LTLIBOBJS'
ac_subst_files='' ac_subst_files=''
# Initialize some variables set by options. # Initialize some variables set by options.
@ -1952,7 +1952,7 @@ fi
# Define the identity of the package. # Define the identity of the package.
PACKAGE=kwin_MachBunt PACKAGE=twin_MachBunt
VERSION=0.1 VERSION=0.1
@ -2089,11 +2089,11 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin" kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs" test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
if test -n "$KDEDIRS"; then if test -n "$TDEDIRS"; then
kde_save_IFS=$IFS kde_save_IFS=$IFS
IFS=: IFS=:
for dir in $KDEDIRS; do for dir in $TDEDIRS; do
kde_default_bindirs="$dir/bin $kde_default_bindirs " kde_default_bindirs="$dir/bin $kde_default_bindirs "
done done
IFS=$kde_save_IFS IFS=$kde_save_IFS
@ -2101,12 +2101,12 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
if test "x$prefix" = "xNONE"; then if test "x$prefix" = "xNONE"; then
echo "$as_me:$LINENO: checking for kde-config" >&5 echo "$as_me:$LINENO: checking for tde-config" >&5
echo $ECHO_N "checking for kde-config... $ECHO_C" >&6 echo $ECHO_N "checking for tde-config... $ECHO_C" >&6
if test -n "$KDECONFIG"; then if test -n "$KDECONFIG"; then
kde_cv_path="$KDECONFIG"; kde_cv_path="$KDECONFIG";
else else
kde_cache=`echo kde-config | sed 'y%./+-%__p_%'` kde_cache=`echo tde-config | sed 'y%./+-%__p_%'`
if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
@ -2125,16 +2125,16 @@ else
IFS=$kde_save_IFS IFS=$kde_save_IFS
for dir in $dirs; do for dir in $dirs; do
if test -x "$dir/kde-config"; then if test -x "$dir/tde-config"; then
if test -n "" if test -n ""
then then
evalstr="$dir/kde-config 2>&1 " evalstr="$dir/tde-config 2>&1 "
if eval $evalstr; then if eval $evalstr; then
kde_cv_path="$dir/kde-config" kde_cv_path="$dir/tde-config"
break break
fi fi
else else
kde_cv_path="$dir/kde-config" kde_cv_path="$dir/tde-config"
break break
fi fi
fi fi
@ -2154,10 +2154,10 @@ fi
echo "$as_me:$LINENO: result: not found" >&5 echo "$as_me:$LINENO: result: not found" >&5
echo "${ECHO_T}not found" >&6 echo "${ECHO_T}not found" >&6
{ { echo "$as_me:$LINENO: error: The important program kde-config was not found! { { echo "$as_me:$LINENO: error: The important program tde-config was not found!
Please check whether you installed KDE correctly. Please check whether you installed KDE correctly.
" >&5 " >&5
echo "$as_me: error: The important program kde-config was not found! echo "$as_me: error: The important program tde-config was not found!
Please check whether you installed KDE correctly. Please check whether you installed KDE correctly.
" >&2;} " >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
@ -2173,12 +2173,12 @@ echo "${ECHO_T}$kde_cv_path" >&6
kde_save_PATH="$PATH" kde_save_PATH="$PATH"
PATH="$exec_prefix/bin:$prefix/bin:$PATH" PATH="$exec_prefix/bin:$prefix/bin:$PATH"
echo "$as_me:$LINENO: checking for kde-config" >&5 echo "$as_me:$LINENO: checking for tde-config" >&5
echo $ECHO_N "checking for kde-config... $ECHO_C" >&6 echo $ECHO_N "checking for tde-config... $ECHO_C" >&6
if test -n "$KDECONFIG"; then if test -n "$KDECONFIG"; then
kde_cv_path="$KDECONFIG"; kde_cv_path="$KDECONFIG";
else else
kde_cache=`echo kde-config | sed 'y%./+-%__p_%'` kde_cache=`echo tde-config | sed 'y%./+-%__p_%'`
if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
@ -2197,16 +2197,16 @@ else
IFS=$kde_save_IFS IFS=$kde_save_IFS
for dir in $dirs; do for dir in $dirs; do
if test -x "$dir/kde-config"; then if test -x "$dir/tde-config"; then
if test -n "" if test -n ""
then then
evalstr="$dir/kde-config 2>&1 " evalstr="$dir/tde-config 2>&1 "
if eval $evalstr; then if eval $evalstr; then
kde_cv_path="$dir/kde-config" kde_cv_path="$dir/tde-config"
break break
fi fi
else else
kde_cv_path="$dir/kde-config" kde_cv_path="$dir/tde-config"
break break
fi fi
fi fi
@ -2226,10 +2226,10 @@ fi
echo "$as_me:$LINENO: result: not found" >&5 echo "$as_me:$LINENO: result: not found" >&5
echo "${ECHO_T}not found" >&6 echo "${ECHO_T}not found" >&6
{ { echo "$as_me:$LINENO: error: The important program kde-config was not found! { { echo "$as_me:$LINENO: error: The important program tde-config was not found!
Please check whether you installed KDE correctly. Please check whether you installed KDE correctly.
" >&5 " >&5
echo "$as_me: error: The important program kde-config was not found! echo "$as_me: error: The important program tde-config was not found!
Please check whether you installed KDE correctly. Please check whether you installed KDE correctly.
" >&2;} " >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
@ -2246,13 +2246,13 @@ echo "${ECHO_T}$kde_cv_path" >&6
kde_libs_prefix=`$KDECONFIG --prefix` kde_libs_prefix=`$KDECONFIG --prefix`
if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
{ { echo "$as_me:$LINENO: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs. { { echo "$as_me:$LINENO: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs.
This means it has been moved since you installed it. This means it has been moved since you installed it.
This won't work. Please recompile kdelibs for the new prefix. This won't work. Please recompile tdelibs for the new prefix.
" >&5 " >&5
echo "$as_me: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs. echo "$as_me: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs.
This means it has been moved since you installed it. This means it has been moved since you installed it.
This won't work. Please recompile kdelibs for the new prefix. This won't work. Please recompile tdelibs for the new prefix.
" >&2;} " >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
@ -2263,8 +2263,8 @@ echo "$as_me: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_
echo $ECHO_N "checking where to install... $ECHO_C" >&6 echo $ECHO_N "checking where to install... $ECHO_C" >&6
if test "x$prefix" = "xNONE"; then if test "x$prefix" = "xNONE"; then
prefix=$kde_libs_prefix prefix=$kde_libs_prefix
echo "$as_me:$LINENO: result: $prefix (as returned by kde-config)" >&5 echo "$as_me:$LINENO: result: $prefix (as returned by tde-config)" >&5
echo "${ECHO_T}$prefix (as returned by kde-config)" >&6 echo "${ECHO_T}$prefix (as returned by tde-config)" >&6
else else
given_prefix=$prefix given_prefix=$prefix
echo "$as_me:$LINENO: result: $prefix (as requested)" >&5 echo "$as_me:$LINENO: result: $prefix (as requested)" >&5
@ -7103,17 +7103,17 @@ fi;
kdelibsuff="$kde_libs_suffix" tdelibsuff="$kde_libs_suffix"
if test -z "$kdelibsuff"; then if test -z "$tdelibsuff"; then
kdelibsuff="no" tdelibsuff="no"
fi fi
# Check whether --enable-libsuffix or --disable-libsuffix was given. # Check whether --enable-libsuffix or --disable-libsuffix was given.
if test "${enable_libsuffix+set}" = set; then if test "${enable_libsuffix+set}" = set; then
enableval="$enable_libsuffix" enableval="$enable_libsuffix"
kdelibsuff=$enableval tdelibsuff=$enableval
fi; fi;
if test "$kdelibsuff" = "auto"; then if test "$tdelibsuff" = "auto"; then
cat > conftest.c << EOF cat > conftest.c << EOF
#include <stdio.h> #include <stdio.h>
@ -7121,17 +7121,17 @@ int main() {
return 0; return 0;
} }
EOF EOF
kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ tdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
s,.*/lib\([^\/]*\)/.*,\1, s,.*/lib\([^\/]*\)/.*,\1,
p p
}'` }'`
rm -rf conftest.* rm -rf conftest.*
fi fi
if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then if test "$tdelibsuff" = "no" || test "$tdelibsuff" = "none"; then
kdelibsuff= tdelibsuff=
fi fi
if test -z "$kdelibsuff"; then if test -z "$tdelibsuff"; then
echo "$as_me:$LINENO: result: not using lib directory suffix" >&5 echo "$as_me:$LINENO: result: not using lib directory suffix" >&5
echo "${ECHO_T}not using lib directory suffix" >&6 echo "${ECHO_T}not using lib directory suffix" >&6
@ -7141,16 +7141,16 @@ _ACEOF
else else
if test "$libdir" = '${exec_prefix}/lib'; then if test "$libdir" = '${exec_prefix}/lib'; then
libdir="$libdir${kdelibsuff}" libdir="$libdir${tdelibsuff}"
libdir="$libdir" libdir="$libdir"
fi fi
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
#define KDELIBSUFF "${kdelibsuff}" #define KDELIBSUFF "${tdelibsuff}"
_ACEOF _ACEOF
echo "$as_me:$LINENO: result: using lib directory suffix $kdelibsuff" >&5 echo "$as_me:$LINENO: result: using lib directory suffix $tdelibsuff" >&5
echo "${ECHO_T}using lib directory suffix $kdelibsuff" >&6 echo "${ECHO_T}using lib directory suffix $tdelibsuff" >&6
fi fi
# Check whether --enable-fast-install or --disable-fast-install was given. # Check whether --enable-fast-install or --disable-fast-install was given.
@ -21953,7 +21953,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)" KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs. # This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)" KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
@ -22394,7 +22394,7 @@ if test "x$kde_cv_func_strlcat" = xyes; then
else else
case "strlcat" in case "strlcat" in
setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat) setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
kde_cv_proto_strlcat="yes - in libkdefakes" kde_cv_proto_strlcat="yes - in libtdefakes"
;; ;;
*) *)
kde_cv_proto_strlcat=unknown kde_cv_proto_strlcat=unknown
@ -22614,7 +22614,7 @@ if test "x$kde_cv_func_strlcpy" = xyes; then
else else
case "strlcpy" in case "strlcpy" in
setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat) setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
kde_cv_proto_strlcpy="yes - in libkdefakes" kde_cv_proto_strlcpy="yes - in libtdefakes"
;; ;;
*) *)
kde_cv_proto_strlcpy=unknown kde_cv_proto_strlcpy=unknown
@ -24822,7 +24822,7 @@ if test "x$kde_cv_func_res_init" = xyes; then
else else
case "res_init" in case "res_init" in
setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat) setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
kde_cv_proto_res_init="yes - in libkdefakes" kde_cv_proto_res_init="yes - in libtdefakes"
;; ;;
*) *)
kde_cv_proto_res_init=unknown kde_cv_proto_res_init=unknown
@ -28472,41 +28472,41 @@ sed 's/^/| /' conftest.$ac_ext >&5
LIBS="$ac_save_LIBS" LIBS="$ac_save_LIBS"
# First see if replacing the include by lib works. # First see if replacing the include by lib works.
# Check X11 before X11Rn because it is often a symlink to the current release. # Check X11 before X11Rn because it is often a symlink to the current release.
for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \ for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \
/usr/X11/lib${kdelibsuff} \ /usr/X11/lib${tdelibsuff} \
/usr/X11R6/lib${kdelibsuff} \ /usr/X11R6/lib${tdelibsuff} \
/usr/X11R5/lib${kdelibsuff} \ /usr/X11R5/lib${tdelibsuff} \
/usr/X11R4/lib${kdelibsuff} \ /usr/X11R4/lib${tdelibsuff} \
\ \
/usr/lib${kdelibsuff}/X11 \ /usr/lib${tdelibsuff}/X11 \
/usr/lib${kdelibsuff}/X11R6 \ /usr/lib${tdelibsuff}/X11R6 \
/usr/lib${kdelibsuff}/X11R5 \ /usr/lib${tdelibsuff}/X11R5 \
/usr/lib${kdelibsuff}/X11R4 \ /usr/lib${tdelibsuff}/X11R4 \
\ \
/usr/local/X11/lib${kdelibsuff} \ /usr/local/X11/lib${tdelibsuff} \
/usr/local/X11R6/lib${kdelibsuff} \ /usr/local/X11R6/lib${tdelibsuff} \
/usr/local/X11R5/lib${kdelibsuff} \ /usr/local/X11R5/lib${tdelibsuff} \
/usr/local/X11R4/lib${kdelibsuff} \ /usr/local/X11R4/lib${tdelibsuff} \
\ \
/usr/local/lib${kdelibsuff}/X11 \ /usr/local/lib${tdelibsuff}/X11 \
/usr/local/lib${kdelibsuff}/X11R6 \ /usr/local/lib${tdelibsuff}/X11R6 \
/usr/local/lib${kdelibsuff}/X11R5 \ /usr/local/lib${tdelibsuff}/X11R5 \
/usr/local/lib${kdelibsuff}/X11R4 \ /usr/local/lib${tdelibsuff}/X11R4 \
\ \
/usr/X386/lib${kdelibsuff} \ /usr/X386/lib${tdelibsuff} \
/usr/x386/lib${kdelibsuff} \ /usr/x386/lib${tdelibsuff} \
/usr/XFree86/lib${kdelibsuff}/X11 \ /usr/XFree86/lib${tdelibsuff}/X11 \
\ \
/usr/lib${kdelibsuff} \ /usr/lib${tdelibsuff} \
/usr/local/lib${kdelibsuff} \ /usr/local/lib${tdelibsuff} \
/usr/unsupported/lib${kdelibsuff} \ /usr/unsupported/lib${tdelibsuff} \
/usr/athena/lib${kdelibsuff} \ /usr/athena/lib${tdelibsuff} \
/usr/local/x11r5/lib${kdelibsuff} \ /usr/local/x11r5/lib${tdelibsuff} \
/usr/lpp/Xamples/lib${kdelibsuff} \ /usr/lpp/Xamples/lib${tdelibsuff} \
/lib/usr/lib${kdelibsuff}/X11 \ /lib/usr/lib${tdelibsuff}/X11 \
\ \
/usr/openwin/lib${kdelibsuff} \ /usr/openwin/lib${tdelibsuff} \
/usr/openwin/share/lib${kdelibsuff} \ /usr/openwin/share/lib${tdelibsuff} \
; \ ; \
do do
for ac_extension in a so sl; do for ac_extension in a so sl; do
@ -28565,7 +28565,7 @@ fi
ac_x_includes="." ac_x_includes="."
fi fi
if test -z "$ac_x_libraries"; then if test -z "$ac_x_libraries"; then
ac_x_libraries="/usr/lib${kdelibsuff}" ac_x_libraries="/usr/lib${tdelibsuff}"
fi fi
esac esac
#from now on we use our own again #from now on we use our own again
@ -29949,7 +29949,7 @@ qt_includes=""
if test "${with_qt_dir+set}" = set; then if test "${with_qt_dir+set}" = set; then
withval="$with_qt_dir" withval="$with_qt_dir"
ac_qt_includes="$withval"/include ac_qt_includes="$withval"/include
ac_qt_libraries="$withval"/lib${kdelibsuff} ac_qt_libraries="$withval"/lib${tdelibsuff}
ac_qt_bindir="$withval"/bin ac_qt_bindir="$withval"/bin
fi; fi;
@ -30013,7 +30013,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
@ -30820,16 +30820,16 @@ else
if test "$kde_qtver" = 1; then if test "$kde_qtver" = 1; then
kde_check_header="ksock.h" kde_check_header="ksock.h"
kde_check_lib="libkdecore.la" kde_check_lib="libtdecore.la"
else else
kde_check_header="ksharedptr.h" kde_check_header="ksharedptr.h"
kde_check_lib="libkio.la" kde_check_lib="libtdeio.la"
fi fi
if test -z ""; then if test -z ""; then
kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs" test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs"
kde_incdirs="$ac_kde_includes $kde_incdirs" kde_incdirs="$ac_kde_includes $kde_incdirs"
kde_incdir=NO kde_incdir=NO
@ -30858,8 +30858,8 @@ So, check this please and use another prefix!" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}"
test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs" test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs"
kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
kde_libdir=NO kde_libdir=NO
@ -30883,7 +30883,7 @@ kde_widgetdir=NO
kde_widgetdir=NO kde_widgetdir=NO
for i in $kde_libdirs; for i in $kde_libdirs;
do do
for j in "kde3/plugins/designer/kdewidgets.la"; for j in "kde3/plugins/designer/tdewidgets.la";
do do
echo "configure: 30888: $i/$j" >&5 echo "configure: 30888: $i/$j" >&5
if test -r "$i/$j"; then if test -r "$i/$j"; then
@ -30905,13 +30905,13 @@ So, check this please and use another prefix!" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/tdewidgets.la"; then
{ { echo "$as_me:$LINENO: error: { { echo "$as_me:$LINENO: error:
I can't find the designer plugins. These are required and should have been installed I can't find the designer plugins. These are required and should have been installed
by kdelibs" >&5 by tdelibs" >&5
echo "$as_me: error: echo "$as_me: error:
I can't find the designer plugins. These are required and should have been installed I can't find the designer plugins. These are required and should have been installed
by kdelibs" >&2;} by tdelibs" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
@ -31045,20 +31045,20 @@ echo "$as_me:$LINENO: result: $kde_cv_uic_plugins" >&5
echo "${ECHO_T}$kde_cv_uic_plugins" >&6 echo "${ECHO_T}$kde_cv_uic_plugins" >&6
if test "$kde_cv_uic_plugins" != yes; then if test "$kde_cv_uic_plugins" != yes; then
{ { echo "$as_me:$LINENO: error: { { echo "$as_me:$LINENO: error:
you need to install kdelibs first. you need to install tdelibs first.
If you did install kdelibs, then the Qt version that is picked up by If you did install tdelibs, then the Qt version that is picked up by
this configure is not the same version you used to compile kdelibs. this configure is not the same version you used to compile tdelibs.
The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the
_same Qt version_, compiled with the _same compiler_ and the same Qt _same Qt version_, compiled with the _same compiler_ and the same Qt
configuration settings. configuration settings.
" >&5 " >&5
echo "$as_me: error: echo "$as_me: error:
you need to install kdelibs first. you need to install tdelibs first.
If you did install kdelibs, then the Qt version that is picked up by If you did install tdelibs, then the Qt version that is picked up by
this configure is not the same version you used to compile kdelibs. this configure is not the same version you used to compile tdelibs.
The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the
_same Qt version_, compiled with the _same compiler_ and the same Qt _same Qt version_, compiled with the _same compiler_ and the same Qt
configuration settings. configuration settings.
" >&2;} " >&2;}
@ -31234,20 +31234,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");
@ -31310,7 +31310,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
echo "$as_me:$LINENO: checking for KDE libraries installed" >&5 echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6 echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6
ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5' ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5'
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>&5 (eval $ac_link) 2>&5
@ -31322,22 +31322,22 @@ echo "${ECHO_T}yes" >&6
else else
{ { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application! { { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
Check, if your compiler is installed correctly and if you have used the Check, if your compiler is installed correctly and if you have used the
same compiler to compile Qt and kdelibs as you did use now. same compiler to compile Qt and tdelibs as you did use now.
For more details about this problem, look at the end of config.log." >&5 For more details about this problem, look at the end of config.log." >&5
echo "$as_me: error: your system fails at linking a small KDE application! echo "$as_me: error: your system fails at linking a small KDE application!
Check, if your compiler is installed correctly and if you have used the Check, if your compiler is installed correctly and if you have used the
same compiler to compile Qt and kdelibs as you did use now. same compiler to compile Qt and tdelibs as you did use now.
For more details about this problem, look at the end of config.log." >&2;} For more details about this problem, look at the end of config.log." >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
if eval `KDEDIR= ./conftest 2>&5`; then if eval `TDEDIR= ./conftest 2>&5`; then
kde_result=done kde_result=done
else else
kde_result=problems kde_result=problems
fi fi
KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
kde_have_all_paths=yes kde_have_all_paths=yes
@ -31537,20 +31537,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");
@ -31613,7 +31613,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
echo "$as_me:$LINENO: checking for KDE libraries installed" >&5 echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6 echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6
ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5' ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5'
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>&5 (eval $ac_link) 2>&5
@ -31625,22 +31625,22 @@ echo "${ECHO_T}yes" >&6
else else
{ { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application! { { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
Check, if your compiler is installed correctly and if you have used the Check, if your compiler is installed correctly and if you have used the
same compiler to compile Qt and kdelibs as you did use now. same compiler to compile Qt and tdelibs as you did use now.
For more details about this problem, look at the end of config.log." >&5 For more details about this problem, look at the end of config.log." >&5
echo "$as_me: error: your system fails at linking a small KDE application! echo "$as_me: error: your system fails at linking a small KDE application!
Check, if your compiler is installed correctly and if you have used the Check, if your compiler is installed correctly and if you have used the
same compiler to compile Qt and kdelibs as you did use now. same compiler to compile Qt and tdelibs as you did use now.
For more details about this problem, look at the end of config.log." >&2;} For more details about this problem, look at the end of config.log." >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
if eval `KDEDIR= ./conftest 2>&5`; then if eval `TDEDIR= ./conftest 2>&5`; then
kde_result=done kde_result=done
else else
kde_result=problems kde_result=problems
fi fi
KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
kde_have_all_paths=yes kde_have_all_paths=yes
@ -31749,11 +31749,11 @@ _ACEOF
kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin" kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs" test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
if test -n "$KDEDIRS"; then if test -n "$TDEDIRS"; then
kde_save_IFS=$IFS kde_save_IFS=$IFS
IFS=: IFS=:
for dir in $KDEDIRS; do for dir in $TDEDIRS; do
kde_default_bindirs="$dir/bin $kde_default_bindirs " kde_default_bindirs="$dir/bin $kde_default_bindirs "
done done
IFS=$kde_save_IFS IFS=$kde_save_IFS
@ -32127,12 +32127,12 @@ echo "${ECHO_T}$kde_cv_path" >&6
if test -n "$kde32ornewer"; then if test -n "$kde32ornewer"; then
echo "$as_me:$LINENO: checking for kconfig_compiler" >&5 echo "$as_me:$LINENO: checking for tdeconfig_compiler" >&5
echo $ECHO_N "checking for kconfig_compiler... $ECHO_C" >&6 echo $ECHO_N "checking for tdeconfig_compiler... $ECHO_C" >&6
if test -n "$KCONFIG_COMPILER"; then if test -n "$KCONFIG_COMPILER"; then
kde_cv_path="$KCONFIG_COMPILER"; kde_cv_path="$KCONFIG_COMPILER";
else else
kde_cache=`echo kconfig_compiler | sed 'y%./+-%__p_%'` kde_cache=`echo tdeconfig_compiler | sed 'y%./+-%__p_%'`
if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
@ -32151,16 +32151,16 @@ else
IFS=$kde_save_IFS IFS=$kde_save_IFS
for dir in $dirs; do for dir in $dirs; do
if test -x "$dir/kconfig_compiler"; then if test -x "$dir/tdeconfig_compiler"; then
if test -n "" if test -n ""
then then
evalstr="$dir/kconfig_compiler 2>&1 " evalstr="$dir/tdeconfig_compiler 2>&1 "
if eval $evalstr; then if eval $evalstr; then
kde_cv_path="$dir/kconfig_compiler" kde_cv_path="$dir/tdeconfig_compiler"
break break
fi fi
else else
kde_cv_path="$dir/kconfig_compiler" kde_cv_path="$dir/tdeconfig_compiler"
break break
fi fi
fi fi
@ -32180,10 +32180,10 @@ fi
echo "$as_me:$LINENO: result: not found" >&5 echo "$as_me:$LINENO: result: not found" >&5
echo "${ECHO_T}not found" >&6 echo "${ECHO_T}not found" >&6
{ { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found! { { echo "$as_me:$LINENO: error: The important program tdeconfig_compiler was not found!
Please check whether you installed KDE correctly. Please check whether you installed KDE correctly.
" >&5 " >&5
echo "$as_me: error: The important program kconfig_compiler was not found! echo "$as_me: error: The important program tdeconfig_compiler was not found!
Please check whether you installed KDE correctly. Please check whether you installed KDE correctly.
" >&2;} " >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
@ -32267,12 +32267,12 @@ echo "${ECHO_T}$kde_cv_path" >&6
fi fi
if test -n "$kde33ornewer"; then if test -n "$kde33ornewer"; then
echo "$as_me:$LINENO: checking for makekdewidgets" >&5 echo "$as_me:$LINENO: checking for maketdewidgets" >&5
echo $ECHO_N "checking for makekdewidgets... $ECHO_C" >&6 echo $ECHO_N "checking for maketdewidgets... $ECHO_C" >&6
if test -n "$MAKEKDEWIDGETS"; then if test -n "$MAKETDEWIDGETS"; then
kde_cv_path="$MAKEKDEWIDGETS"; kde_cv_path="$MAKETDEWIDGETS";
else else
kde_cache=`echo makekdewidgets | sed 'y%./+-%__p_%'` kde_cache=`echo maketdewidgets | sed 'y%./+-%__p_%'`
if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
@ -32291,16 +32291,16 @@ else
IFS=$kde_save_IFS IFS=$kde_save_IFS
for dir in $dirs; do for dir in $dirs; do
if test -x "$dir/makekdewidgets"; then if test -x "$dir/maketdewidgets"; then
if test -n "" if test -n ""
then then
evalstr="$dir/makekdewidgets 2>&1 " evalstr="$dir/maketdewidgets 2>&1 "
if eval $evalstr; then if eval $evalstr; then
kde_cv_path="$dir/makekdewidgets" kde_cv_path="$dir/maketdewidgets"
break break
fi fi
else else
kde_cv_path="$dir/makekdewidgets" kde_cv_path="$dir/maketdewidgets"
break break
fi fi
fi fi
@ -32320,10 +32320,10 @@ fi
echo "$as_me:$LINENO: result: not found" >&5 echo "$as_me:$LINENO: result: not found" >&5
echo "${ECHO_T}not found" >&6 echo "${ECHO_T}not found" >&6
{ { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found! { { echo "$as_me:$LINENO: error: The important program maketdewidgets was not found!
Please check whether you installed KDE correctly. Please check whether you installed KDE correctly.
" >&5 " >&5
echo "$as_me: error: The important program makekdewidgets was not found! echo "$as_me: error: The important program maketdewidgets was not found!
Please check whether you installed KDE correctly. Please check whether you installed KDE correctly.
" >&2;} " >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
@ -32331,7 +32331,7 @@ Please check whether you installed KDE correctly.
else else
echo "$as_me:$LINENO: result: $kde_cv_path" >&5 echo "$as_me:$LINENO: result: $kde_cv_path" >&5
echo "${ECHO_T}$kde_cv_path" >&6 echo "${ECHO_T}$kde_cv_path" >&6
MAKEKDEWIDGETS=$kde_cv_path MAKETDEWIDGETS=$kde_cv_path
fi fi
@ -32401,7 +32401,7 @@ echo "${ECHO_T}$kde_cv_path" >&6
if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share" kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs" test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs"
KDE_XSL_STYLESHEET=NO KDE_XSL_STYLESHEET=NO
for i in $kde_sharedirs; for i in $kde_sharedirs;
@ -32463,7 +32463,7 @@ done
kdeinitdir='$(kde_moduledir)' tdeinitdir='$(kde_moduledir)'
@ -32482,16 +32482,16 @@ fi
if test $kde_qtver = 3; then if test $kde_qtver = 3; then
case $host in case $host in
*cygwin*) lib_kded="-lkdeinit_kded" ;; *cygwin*) lib_kded="-ltdeinit_kded" ;;
*) lib_kded="" ;; *) lib_kded="" ;;
esac esac
LIB_KDED=$lib_kded LIB_KDED=$lib_kded
LIB_KDECORE="-lkdecore" LIB_TDECORE="-ltdecore"
LIB_KDEUI="-lkdeui" LIB_TDEUI="-ltdeui"
LIB_KIO="-lkio" LIB_TDEIO="-ltdeio"
LIB_KJS="-lkjs" LIB_KJS="-lkjs"
@ -32499,66 +32499,66 @@ if test $kde_qtver = 3; then
LIB_KAB="-lkab" LIB_KAB="-lkab"
LIB_KABC="-lkabc" LIB_KABC="-ltdeabc"
LIB_KHTML="-lkhtml" LIB_TDEHTML="-ltdehtml"
LIB_KSPELL="-lkspell" LIB_TDESPELL="-ltdespell"
LIB_KPARTS="-lkparts" LIB_TDEPARTS="-ltdeparts"
LIB_KDEPRINT="-lkdeprint" LIB_TDEPRINT="-ltdeprint"
LIB_KUTILS="-lkutils" LIB_TDEUTILS="-ltdeutils"
LIB_KDEPIM="-lkdepim" LIB_TDEPIM="-ltdepim"
LIB_KIMPROXY="-lkimproxy" LIB_TDEIMPROXY="-ltdeimproxy"
LIB_KNEWSTUFF="-lknewstuff" LIB_KNEWSTUFF="-lknewstuff"
LIB_KDNSSD="-lkdnssd" LIB_TDEDNSSD="-ltdednssd"
LIB_KUNITTEST="-lkunittest" LIB_TDEUNITTEST="-ltdeunittest"
# these are for backward compatibility # these are for backward compatibility
LIB_KSYCOCA="-lkio" LIB_TDESYCOCA="-ltdeio"
LIB_KFILE="-lkio" LIB_KFILE="-ltdeio"
elif test $kde_qtver = 2; then elif test $kde_qtver = 2; then
LIB_KDECORE="-lkdecore" LIB_TDECORE="-ltdecore"
LIB_KDEUI="-lkdeui" LIB_TDEUI="-ltdeui"
LIB_KIO="-lkio" LIB_TDEIO="-ltdeio"
LIB_KSYCOCA="-lksycoca" LIB_TDESYCOCA="-ltdesycoca"
LIB_SMB="-lsmb" LIB_SMB="-lsmb"
LIB_KFILE="-lkfile" LIB_KFILE="-ltdefile"
LIB_KAB="-lkab" LIB_KAB="-lkab"
LIB_KHTML="-lkhtml" LIB_TDEHTML="-ltdehtml"
LIB_KSPELL="-lkspell" LIB_TDESPELL="-ltdespell"
LIB_KPARTS="-lkparts" LIB_TDEPARTS="-ltdeparts"
LIB_KDEPRINT="-lkdeprint" LIB_TDEPRINT="-ltdeprint"
else else
LIB_KDECORE="-lkdecore -lXext $(LIB_QT)" LIB_TDECORE="-ltdecore -lXext $(LIB_QT)"
LIB_KDEUI="-lkdeui $(LIB_KDECORE)" LIB_TDEUI="-ltdeui $(LIB_TDECORE)"
LIB_KFM="-lkfm $(LIB_KDECORE)" LIB_KFM="-lkfm $(LIB_TDECORE)"
LIB_KFILE="-lkfile $(LIB_KFM) $(LIB_KDEUI)" LIB_KFILE="-ltdefile $(LIB_KFM) $(LIB_TDEUI)"
LIB_KAB="-lkab $(LIB_KIMGIO) $(LIB_KDECORE)" LIB_KAB="-lkab $(LIB_KIMGIO) $(LIB_TDECORE)"
fi fi
@ -33711,7 +33711,7 @@ s,@all_libraries@,$all_libraries,;t t
s,@AUTODIRS@,$AUTODIRS,;t t s,@AUTODIRS@,$AUTODIRS,;t t
s,@include_ARTS_TRUE@,$include_ARTS_TRUE,;t t s,@include_ARTS_TRUE@,$include_ARTS_TRUE,;t t
s,@include_ARTS_FALSE@,$include_ARTS_FALSE,;t t s,@include_ARTS_FALSE@,$include_ARTS_FALSE,;t t
s,@MAKEKDEWIDGETS@,$MAKEKDEWIDGETS,;t t s,@MAKETDEWIDGETS@,$MAKETDEWIDGETS,;t t
s,@KCONFIG_COMPILER@,$KCONFIG_COMPILER,;t t s,@KCONFIG_COMPILER@,$KCONFIG_COMPILER,;t t
s,@KCFG_DEPENDENCIES@,$KCFG_DEPENDENCIES,;t t s,@KCFG_DEPENDENCIES@,$KCFG_DEPENDENCIES,;t t
s,@DCOPIDLNG@,$DCOPIDLNG,;t t s,@DCOPIDLNG@,$DCOPIDLNG,;t t
@ -33741,28 +33741,28 @@ s,@kde_templatesdir@,$kde_templatesdir,;t t
s,@kde_servicesdir@,$kde_servicesdir,;t t s,@kde_servicesdir@,$kde_servicesdir,;t t
s,@kde_servicetypesdir@,$kde_servicetypesdir,;t t s,@kde_servicetypesdir@,$kde_servicetypesdir,;t t
s,@kde_moduledir@,$kde_moduledir,;t t s,@kde_moduledir@,$kde_moduledir,;t t
s,@kdeinitdir@,$kdeinitdir,;t t s,@tdeinitdir@,$tdeinitdir,;t t
s,@kde_styledir@,$kde_styledir,;t t s,@kde_styledir@,$kde_styledir,;t t
s,@kde_widgetdir@,$kde_widgetdir,;t t s,@kde_widgetdir@,$kde_widgetdir,;t t
s,@LIB_KDED@,$LIB_KDED,;t t s,@LIB_KDED@,$LIB_KDED,;t t
s,@LIB_KDECORE@,$LIB_KDECORE,;t t s,@LIB_TDECORE@,$LIB_TDECORE,;t t
s,@LIB_KDEUI@,$LIB_KDEUI,;t t s,@LIB_TDEUI@,$LIB_TDEUI,;t t
s,@LIB_KIO@,$LIB_KIO,;t t s,@LIB_TDEIO@,$LIB_TDEIO,;t t
s,@LIB_KJS@,$LIB_KJS,;t t s,@LIB_KJS@,$LIB_KJS,;t t
s,@LIB_SMB@,$LIB_SMB,;t t s,@LIB_SMB@,$LIB_SMB,;t t
s,@LIB_KAB@,$LIB_KAB,;t t s,@LIB_KAB@,$LIB_KAB,;t t
s,@LIB_KABC@,$LIB_KABC,;t t s,@LIB_KABC@,$LIB_KABC,;t t
s,@LIB_KHTML@,$LIB_KHTML,;t t s,@LIB_TDEHTML@,$LIB_TDEHTML,;t t
s,@LIB_KSPELL@,$LIB_KSPELL,;t t s,@LIB_TDESPELL@,$LIB_TDESPELL,;t t
s,@LIB_KPARTS@,$LIB_KPARTS,;t t s,@LIB_TDEPARTS@,$LIB_TDEPARTS,;t t
s,@LIB_KDEPRINT@,$LIB_KDEPRINT,;t t s,@LIB_TDEPRINT@,$LIB_TDEPRINT,;t t
s,@LIB_KUTILS@,$LIB_KUTILS,;t t s,@LIB_TDEUTILS@,$LIB_TDEUTILS,;t t
s,@LIB_KDEPIM@,$LIB_KDEPIM,;t t s,@LIB_TDEPIM@,$LIB_TDEPIM,;t t
s,@LIB_KIMPROXY@,$LIB_KIMPROXY,;t t s,@LIB_TDEIMPROXY@,$LIB_TDEIMPROXY,;t t
s,@LIB_KNEWSTUFF@,$LIB_KNEWSTUFF,;t t s,@LIB_KNEWSTUFF@,$LIB_KNEWSTUFF,;t t
s,@LIB_KDNSSD@,$LIB_KDNSSD,;t t s,@LIB_TDEDNSSD@,$LIB_TDEDNSSD,;t t
s,@LIB_KUNITTEST@,$LIB_KUNITTEST,;t t s,@LIB_TDEUNITTEST@,$LIB_TDEUNITTEST,;t t
s,@LIB_KSYCOCA@,$LIB_KSYCOCA,;t t s,@LIB_TDESYCOCA@,$LIB_TDESYCOCA,;t t
s,@LIB_KFILE@,$LIB_KFILE,;t t s,@LIB_KFILE@,$LIB_KFILE,;t t
s,@LIB_KFM@,$LIB_KFM,;t t s,@LIB_KFM@,$LIB_KFM,;t t
s,@TOPSUBDIRS@,$TOPSUBDIRS,;t t s,@TOPSUBDIRS@,$TOPSUBDIRS,;t t
@ -34493,13 +34493,13 @@ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then
# And if so, warn when they don't match # And if so, warn when they don't match
if test "$kde_libs_prefix" != "$given_prefix"; then if test "$kde_libs_prefix" != "$given_prefix"; then
# And if kde doesn't know about the prefix yet # And if kde doesn't know about the prefix yet
echo ":"`kde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null echo ":"`tde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null
if test $? -ne 0; then if test $? -ne 0; then
echo "" echo ""
echo "Warning: you chose to install this package in $given_prefix," echo "Warning: you chose to install this package in $given_prefix,"
echo "but KDE was found in $kde_libs_prefix." echo "but KDE was found in $kde_libs_prefix."
echo "For this to work, you will need to tell KDE about the new prefix, by ensuring" echo "For this to work, you will need to tell KDE about the new prefix, by ensuring"
echo "that KDEDIRS contains it, e.g. export KDEDIRS=$given_prefix:$kde_libs_prefix" echo "that TDEDIRS contains it, e.g. export TDEDIRS=$given_prefix:$kde_libs_prefix"
echo "Then restart KDE." echo "Then restart KDE."
echo "" echo ""
fi fi

6
configure.in
Unescape View File

@ -40,7 +40,7 @@ dnl Perform program name transformation
AC_ARG_PROGRAM AC_ARG_PROGRAM
dnl Automake doc recommends to do this only here. (Janos) dnl Automake doc recommends to do this only here. (Janos)
AM_INIT_AUTOMAKE(kwin_MachBunt, 0.1) dnl searches for some needed programs AM_INIT_AUTOMAKE(twin_MachBunt, 0.1) dnl searches for some needed programs
KDE_SET_PREFIX KDE_SET_PREFIX
@ -78,13 +78,13 @@ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then
# And if so, warn when they don't match # And if so, warn when they don't match
if test "$kde_libs_prefix" != "$given_prefix"; then if test "$kde_libs_prefix" != "$given_prefix"; then
# And if kde doesn't know about the prefix yet # And if kde doesn't know about the prefix yet
echo ":"`kde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null echo ":"`tde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null
if test $? -ne 0; then if test $? -ne 0; then
echo "" echo ""
echo "Warning: you chose to install this package in $given_prefix," echo "Warning: you chose to install this package in $given_prefix,"
echo "but KDE was found in $kde_libs_prefix." echo "but KDE was found in $kde_libs_prefix."
echo "For this to work, you will need to tell KDE about the new prefix, by ensuring" echo "For this to work, you will need to tell KDE about the new prefix, by ensuring"
echo "that KDEDIRS contains it, e.g. export KDEDIRS=$given_prefix:$kde_libs_prefix" echo "that TDEDIRS contains it, e.g. export TDEDIRS=$given_prefix:$kde_libs_prefix"
echo "Then restart KDE." echo "Then restart KDE."
echo "" echo ""
fi fi

2
configure.in.in
Unescape View File

@ -1,6 +1,6 @@
#MIN_CONFIG(3.2.0) #MIN_CONFIG(3.2.0)
AM_INIT_AUTOMAKE(kwin_MachBunt, 0.1) AM_INIT_AUTOMAKE(twin_MachBunt, 0.1)
AC_C_BIGENDIAN AC_C_BIGENDIAN
AC_CHECK_KDEMAXPATHLEN AC_CHECK_KDEMAXPATHLEN

10
src/.cvsignore
Unescape View File

@ -15,7 +15,7 @@ MachBuntButtonMenu.lo
MachBuntButton.lo MachBuntButton.lo
libkwinSuSE_la_meta_unload.cpp libkwinSuSE_la_meta_unload.cpp
MachBunt.lo MachBunt.lo
kwin3_SuSE.la twin3_SuSE.la
MachBuntButtonHelp.lo MachBuntButtonHelp.lo
MachBuntButtonLower.moc MachBuntButtonLower.moc
MachBuntButton.moc MachBuntButton.moc
@ -24,10 +24,10 @@ libkwinSuSE.la.closure
MachBuntButtonSticky.lo MachBuntButtonSticky.lo
MachBuntButtonClose.moc MachBuntButtonClose.moc
MachBuntButtonIconify.lo MachBuntButtonIconify.lo
kwin_SuSE.la twin_SuSE.la
kwin_SuSE.la.closure twin_SuSE.la.closure
kwin_SuSE_la_meta_unload.cpp twin_SuSE_la_meta_unload.cpp
kwin_SuSE_la_meta_unload.lo twin_SuSE_la_meta_unload.lo
*.lo *.lo
*_closure.cpp *_closure.cpp

8
src/MachBunt.cpp
Unescape View File

@ -11,8 +11,8 @@
#include <kimageeffect.h> #include <kimageeffect.h>
#include <kiconeffect.h> #include <kiconeffect.h>
#include <kdrawutil.h> #include <kdrawutil.h>
#include <klocale.h> #include <tdelocale.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <ntqlabel.h> #include <ntqlabel.h>
@ -238,7 +238,7 @@ void MachBunt::init()
widget()->installEventFilter( this ); widget()->installEventFilter( this );
widget()->setBackgroundMode(NoBackground); widget()->setBackgroundMode(NoBackground);
KConfig c("kwinMachBuntrc"); TDEConfig c("twinMachBuntrc");
c.setGroup("General"); c.setGroup("General");
titlebarResize = c.readBoolEntry("TitleBarResize", true); titlebarResize = c.readBoolEntry("TitleBarResize", true);
titlebarLogo = c.readBoolEntry("TitleBarLogo", true); titlebarLogo = c.readBoolEntry("TitleBarLogo", true);
@ -683,7 +683,7 @@ void MachBunt::paintEvent( TQPaintEvent *pe )
titleBuffer.resize(w-BORDER_LEFT-BORDER_RIGHT, titleHeight); titleBuffer.resize(w-BORDER_LEFT-BORDER_RIGHT, titleHeight);
else else
titleBuffer.resize(w, titleHeight); titleBuffer.resize(w, titleHeight);
KIconEffect kie; TDEIconEffect kie;
TQPainter p2( &titleBuffer, widget()); TQPainter p2( &titleBuffer, widget());

2
src/MachBunt.desktop
Unescape View File

@ -1,3 +1,3 @@
[Desktop Entry] [Desktop Entry]
Name=MachBunt Name=MachBunt
X-KDE-Library=kwin3_MachBunt X-TDE-Library=twin3_MachBunt

2
src/MachBuntButton.cpp
Unescape View File

@ -8,7 +8,7 @@
#include <kimageeffect.h> #include <kimageeffect.h>
#include <kiconeffect.h> #include <kiconeffect.h>
#include <kdrawutil.h> #include <kdrawutil.h>
#include <klocale.h> #include <tdelocale.h>
#include <ntqlayout.h> #include <ntqlayout.h>
#include <ntqdrawutil.h> #include <ntqdrawutil.h>

18
src/Makefile.am
Unescape View File

@ -2,9 +2,9 @@ INCLUDES = -I$(top_srcdir) $(all_includes)
SUBDIRS = . SUBDIRS = .
kde_module_LTLIBRARIES = kwin3_MachBunt.la kde_module_LTLIBRARIES = twin3_MachBunt.la
kwin3_MachBunt_la_SOURCES = \ twin3_MachBunt_la_SOURCES = \
MachBunt.cpp \ MachBunt.cpp \
MachBuntButton.cpp MachBuntButton.cpp
@ -12,19 +12,19 @@ noinst_HEADERS = \
MachBunt.h \ MachBunt.h \
pixmaps.h pixmaps.h
kwin3_MachBunt_la_LIBADD = $(LIB_KDEUI) -lkdecorations twin3_MachBunt_la_LIBADD = $(LIB_TDEUI) -ltdecorations
kwin3_MachBunt_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module twin3_MachBunt_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
METASOURCES = AUTO METASOURCES = AUTO
linkdir = $(kde_datadir)/kwin/ linkdir = $(kde_datadir)/twin/
link_DATA = MachBunt.desktop link_DATA = MachBunt.desktop
kdisplay_colorscheme_DATA = MachBunt.kcsrc tdedisplay_colorscheme_DATA = MachBunt.kcsrc
kdisplay_colorschemedir = $(kde_datadir)/kdisplay/color-schemes tdedisplay_colorschemedir = $(kde_datadir)/tdedisplay/color-schemes
EXTRA_DIST = $(link_DATA) $(kdisplay_colorscheme_DATA) EXTRA_DIST = $(link_DATA) $(tdedisplay_colorscheme_DATA)
confdir = $(kde_confdir) confdir = $(kde_confdir)
conf_DATA = kwinMachBuntrc conf_DATA = twinMachBuntrc

152
src/Makefile.in
Unescape View File

@ -58,18 +58,18 @@ am__vpath_adj = case $$p in \
esac; esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(confdir)" \ am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(confdir)" \
"$(DESTDIR)$(kdisplay_colorschemedir)" "$(DESTDIR)$(linkdir)" "$(DESTDIR)$(tdedisplay_colorschemedir)" "$(DESTDIR)$(linkdir)"
kde_moduleLTLIBRARIES_INSTALL = $(INSTALL) kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(kde_module_LTLIBRARIES) LTLIBRARIES = $(kde_module_LTLIBRARIES)
am__DEPENDENCIES_1 = am__DEPENDENCIES_1 =
kwin3_MachBunt_la_DEPENDENCIES = $(am__DEPENDENCIES_1) twin3_MachBunt_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
am_kwin3_MachBunt_la_OBJECTS = MachBunt.lo MachBuntButton.lo am_twin3_MachBunt_la_OBJECTS = MachBunt.lo MachBuntButton.lo
#>- kwin3_MachBunt_la_OBJECTS = $(am_kwin3_MachBunt_la_OBJECTS) #>- twin3_MachBunt_la_OBJECTS = $(am_twin3_MachBunt_la_OBJECTS)
#>+ 4 #>+ 4
kwin3_MachBunt_la_final_OBJECTS = kwin3_MachBunt_la.all_cpp.lo twin3_MachBunt_la_final_OBJECTS = twin3_MachBunt_la.all_cpp.lo
kwin3_MachBunt_la_nofinal_OBJECTS = MachBunt.lo MachBuntButton.lo twin3_MachBunt_la_nofinal_OBJECTS = MachBunt.lo MachBuntButton.lo
@KDE_USE_FINAL_FALSE@kwin3_MachBunt_la_OBJECTS = $(kwin3_MachBunt_la_nofinal_OBJECTS) @KDE_USE_FINAL_FALSE@twin3_MachBunt_la_OBJECTS = $(twin3_MachBunt_la_nofinal_OBJECTS)
@KDE_USE_FINAL_TRUE@kwin3_MachBunt_la_OBJECTS = $(kwin3_MachBunt_la_final_OBJECTS) @KDE_USE_FINAL_TRUE@twin3_MachBunt_la_OBJECTS = $(twin3_MachBunt_la_final_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles am__depfiles_maybe = depfiles
@ -91,8 +91,8 @@ CXXLD = $(CXX)
#>+ 2 #>+ 2
CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(kwin3_MachBunt_la_SOURCES) SOURCES = $(twin3_MachBunt_la_SOURCES)
DIST_SOURCES = $(kwin3_MachBunt_la_SOURCES) DIST_SOURCES = $(twin3_MachBunt_la_SOURCES)
#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
#>- html-recursive info-recursive install-data-recursive \ #>- html-recursive info-recursive install-data-recursive \
#>- install-exec-recursive install-info-recursive \ #>- install-exec-recursive install-info-recursive \
@ -107,9 +107,9 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
pdf-recursive ps-recursive uninstall-info-recursive \ pdf-recursive ps-recursive uninstall-info-recursive \
uninstall-recursive nmcheck-recursive bcheck-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
confDATA_INSTALL = $(INSTALL_DATA) confDATA_INSTALL = $(INSTALL_DATA)
kdisplay_colorschemeDATA_INSTALL = $(INSTALL_DATA) tdedisplay_colorschemeDATA_INSTALL = $(INSTALL_DATA)
linkDATA_INSTALL = $(INSTALL_DATA) linkDATA_INSTALL = $(INSTALL_DATA)
DATA = $(conf_DATA) $(kdisplay_colorscheme_DATA) $(link_DATA) DATA = $(conf_DATA) $(tdedisplay_colorscheme_DATA) $(link_DATA)
HEADERS = $(noinst_HEADERS) HEADERS = $(noinst_HEADERS)
ETAGS = etags ETAGS = etags
CTAGS = ctags CTAGS = ctags
@ -202,24 +202,24 @@ LIBUTIL = @LIBUTIL@
LIBZ = @LIBZ@ LIBZ = @LIBZ@
LIB_KAB = @LIB_KAB@ LIB_KAB = @LIB_KAB@
LIB_KABC = @LIB_KABC@ LIB_KABC = @LIB_KABC@
LIB_KDECORE = @LIB_KDECORE@ LIB_TDECORE = @LIB_TDECORE@
LIB_KDED = @LIB_KDED@ LIB_KDED = @LIB_KDED@
LIB_KDEPIM = @LIB_KDEPIM@ LIB_TDEPIM = @LIB_TDEPIM@
LIB_KDEPRINT = @LIB_KDEPRINT@ LIB_TDEPRINT = @LIB_TDEPRINT@
LIB_KDEUI = @LIB_KDEUI@ LIB_TDEUI = @LIB_TDEUI@
LIB_KDNSSD = @LIB_KDNSSD@ LIB_TDEDNSSD = @LIB_TDEDNSSD@
LIB_KFILE = @LIB_KFILE@ LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@ LIB_KFM = @LIB_KFM@
LIB_KHTML = @LIB_KHTML@ LIB_TDEHTML = @LIB_TDEHTML@
LIB_KIMPROXY = @LIB_KIMPROXY@ LIB_TDEIMPROXY = @LIB_TDEIMPROXY@
LIB_KIO = @LIB_KIO@ LIB_TDEIO = @LIB_TDEIO@
LIB_KJS = @LIB_KJS@ LIB_KJS = @LIB_KJS@
LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
LIB_KPARTS = @LIB_KPARTS@ LIB_TDEPARTS = @LIB_TDEPARTS@
LIB_KSPELL = @LIB_KSPELL@ LIB_TDESPELL = @LIB_TDESPELL@
LIB_KSYCOCA = @LIB_KSYCOCA@ LIB_TDESYCOCA = @LIB_TDESYCOCA@
LIB_KUNITTEST = @LIB_KUNITTEST@ LIB_TDEUNITTEST = @LIB_TDEUNITTEST@
LIB_KUTILS = @LIB_KUTILS@ LIB_TDEUTILS = @LIB_TDEUTILS@
LIB_POLL = @LIB_POLL@ LIB_POLL = @LIB_POLL@
LIB_QPE = @LIB_QPE@ LIB_QPE = @LIB_QPE@
LIB_QT = @LIB_QT@ LIB_QT = @LIB_QT@
@ -230,7 +230,7 @@ LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MAKETDEWIDGETS = @MAKETDEWIDGETS@
MCOPIDL = @MCOPIDL@ MCOPIDL = @MCOPIDL@
MEINPROC = @MEINPROC@ MEINPROC = @MEINPROC@
MOC = @MOC@ MOC = @MOC@
@ -329,7 +329,7 @@ kde_styledir = @kde_styledir@
kde_templatesdir = @kde_templatesdir@ kde_templatesdir = @kde_templatesdir@
kde_wallpaperdir = @kde_wallpaperdir@ kde_wallpaperdir = @kde_wallpaperdir@
kde_widgetdir = @kde_widgetdir@ kde_widgetdir = @kde_widgetdir@
kdeinitdir = @kdeinitdir@ tdeinitdir = @tdeinitdir@
libdir = @libdir@ libdir = @libdir@
libexecdir = @libexecdir@ libexecdir = @libexecdir@
localstatedir = @localstatedir@ localstatedir = @localstatedir@
@ -357,8 +357,8 @@ xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@ xdg_menudir = @xdg_menudir@
INCLUDES = -I$(top_srcdir) $(all_includes) INCLUDES = -I$(top_srcdir) $(all_includes)
SUBDIRS = . SUBDIRS = .
kde_module_LTLIBRARIES = kwin3_MachBunt.la kde_module_LTLIBRARIES = twin3_MachBunt.la
kwin3_MachBunt_la_SOURCES = \ twin3_MachBunt_la_SOURCES = \
MachBunt.cpp \ MachBunt.cpp \
MachBuntButton.cpp MachBuntButton.cpp
@ -366,16 +366,16 @@ noinst_HEADERS = \
MachBunt.h \ MachBunt.h \
pixmaps.h pixmaps.h
kwin3_MachBunt_la_LIBADD = $(LIB_KDEUI) -lkdecorations twin3_MachBunt_la_LIBADD = $(LIB_TDEUI) -ltdecorations
kwin3_MachBunt_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module twin3_MachBunt_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
#>- METASOURCES = AUTO #>- METASOURCES = AUTO
linkdir = $(kde_datadir)/kwin/ linkdir = $(kde_datadir)/twin/
link_DATA = MachBunt.desktop link_DATA = MachBunt.desktop
kdisplay_colorscheme_DATA = MachBunt.kcsrc tdedisplay_colorscheme_DATA = MachBunt.kcsrc
kdisplay_colorschemedir = $(kde_datadir)/kdisplay/color-schemes tdedisplay_colorschemedir = $(kde_datadir)/tdedisplay/color-schemes
EXTRA_DIST = $(link_DATA) $(kdisplay_colorscheme_DATA) EXTRA_DIST = $(link_DATA) $(tdedisplay_colorscheme_DATA)
confdir = $(kde_confdir) confdir = $(kde_confdir)
conf_DATA = kwinMachBuntrc conf_DATA = twinMachBuntrc
#>- all: all-recursive #>- all: all-recursive
#>+ 1 #>+ 1
all: docs-am all-recursive all: docs-am all-recursive
@ -451,11 +451,11 @@ clean-kde_moduleLTLIBRARIES:
echo "rm -f \"$${dir}/so_locations\""; \ echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \ rm -f "$${dir}/so_locations"; \
done done
#>- kwin3_MachBunt.la: $(kwin3_MachBunt_la_OBJECTS) $(kwin3_MachBunt_la_DEPENDENCIES) #>- twin3_MachBunt.la: $(twin3_MachBunt_la_OBJECTS) $(twin3_MachBunt_la_DEPENDENCIES)
#>+ 2 #>+ 2
@KDE_USE_CLOSURE_TRUE@kwin3_MachBunt.la: kwin3_MachBunt.la.closure $(kwin3_MachBunt_la_OBJECTS) $(kwin3_MachBunt_la_DEPENDENCIES) @KDE_USE_CLOSURE_TRUE@twin3_MachBunt.la: twin3_MachBunt.la.closure $(twin3_MachBunt_la_OBJECTS) $(twin3_MachBunt_la_DEPENDENCIES)
@KDE_USE_CLOSURE_FALSE@kwin3_MachBunt.la: $(kwin3_MachBunt_la_OBJECTS) $(kwin3_MachBunt_la_DEPENDENCIES) @KDE_USE_CLOSURE_FALSE@twin3_MachBunt.la: $(twin3_MachBunt_la_OBJECTS) $(twin3_MachBunt_la_DEPENDENCIES)
$(CXXLINK) -rpath $(kde_moduledir) $(kwin3_MachBunt_la_LDFLAGS) $(kwin3_MachBunt_la_OBJECTS) $(kwin3_MachBunt_la_LIBADD) $(LIBS) $(CXXLINK) -rpath $(kde_moduledir) $(twin3_MachBunt_la_LDFLAGS) $(twin3_MachBunt_la_OBJECTS) $(twin3_MachBunt_la_LIBADD) $(LIBS)
mostlyclean-compile: mostlyclean-compile:
-rm -f *.$(OBJEXT) -rm -f *.$(OBJEXT)
@ -513,22 +513,22 @@ uninstall-confDATA:
echo " rm -f '$(DESTDIR)$(confdir)/$$f'"; \ echo " rm -f '$(DESTDIR)$(confdir)/$$f'"; \
rm -f "$(DESTDIR)$(confdir)/$$f"; \ rm -f "$(DESTDIR)$(confdir)/$$f"; \
done done
install-kdisplay_colorschemeDATA: $(kdisplay_colorscheme_DATA) install-tdedisplay_colorschemeDATA: $(tdedisplay_colorscheme_DATA)
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
test -z "$(kdisplay_colorschemedir)" || $(mkdir_p) "$(DESTDIR)$(kdisplay_colorschemedir)" test -z "$(tdedisplay_colorschemedir)" || $(mkdir_p) "$(DESTDIR)$(tdedisplay_colorschemedir)"
@list='$(kdisplay_colorscheme_DATA)'; for p in $$list; do \ @list='$(tdedisplay_colorscheme_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \ f=$(am__strip_dir) \
echo " $(kdisplay_colorschemeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kdisplay_colorschemedir)/$$f'"; \ echo " $(tdedisplay_colorschemeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(tdedisplay_colorschemedir)/$$f'"; \
$(kdisplay_colorschemeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kdisplay_colorschemedir)/$$f"; \ $(tdedisplay_colorschemeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(tdedisplay_colorschemedir)/$$f"; \
done done
uninstall-kdisplay_colorschemeDATA: uninstall-tdedisplay_colorschemeDATA:
@$(NORMAL_UNINSTALL) @$(NORMAL_UNINSTALL)
@list='$(kdisplay_colorscheme_DATA)'; for p in $$list; do \ @list='$(tdedisplay_colorscheme_DATA)'; for p in $$list; do \
f=$(am__strip_dir) \ f=$(am__strip_dir) \
echo " rm -f '$(DESTDIR)$(kdisplay_colorschemedir)/$$f'"; \ echo " rm -f '$(DESTDIR)$(tdedisplay_colorschemedir)/$$f'"; \
rm -f "$(DESTDIR)$(kdisplay_colorschemedir)/$$f"; \ rm -f "$(DESTDIR)$(tdedisplay_colorschemedir)/$$f"; \
done done
install-linkDATA: $(link_DATA) install-linkDATA: $(link_DATA)
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
@ -727,7 +727,7 @@ check: check-recursive
all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
installdirs: installdirs-recursive installdirs: installdirs-recursive
installdirs-am: installdirs-am:
for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(confdir)" "$(DESTDIR)$(kdisplay_colorschemedir)" "$(DESTDIR)$(linkdir)"; do \ for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(confdir)" "$(DESTDIR)$(tdedisplay_colorschemedir)" "$(DESTDIR)$(linkdir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \ test -z "$$dir" || $(mkdir_p) "$$dir"; \
done done
install: install-recursive install: install-recursive
@ -781,10 +781,10 @@ info: info-recursive
info-am: info-am:
#>- install-data-am: install-confDATA install-kde_moduleLTLIBRARIES \ #>- install-data-am: install-confDATA install-kde_moduleLTLIBRARIES \
#>- install-kdisplay_colorschemeDATA install-linkDATA #>- install-tdedisplay_colorschemeDATA install-linkDATA
#>+ 2 #>+ 2
install-data-am: install-confDATA \ install-data-am: install-confDATA \
install-kdisplay_colorschemeDATA install-linkDATA install-tdedisplay_colorschemeDATA install-linkDATA
#>- install-exec-am: #>- install-exec-am:
#>+ 1 #>+ 1
@ -816,7 +816,7 @@ ps-am:
uninstall-am: uninstall-confDATA uninstall-info-am \ uninstall-am: uninstall-confDATA uninstall-info-am \
uninstall-kde_moduleLTLIBRARIES \ uninstall-kde_moduleLTLIBRARIES \
uninstall-kdisplay_colorschemeDATA uninstall-linkDATA uninstall-tdedisplay_colorschemeDATA uninstall-linkDATA
uninstall-info: uninstall-info-recursive uninstall-info: uninstall-info-recursive
@ -828,7 +828,7 @@ uninstall-info: uninstall-info-recursive
html-am info info-am install install-am install-confDATA \ html-am info info-am install install-am install-confDATA \
install-data install-data-am install-exec install-exec-am \ install-data install-data-am install-exec install-exec-am \
install-info install-info-am install-kde_moduleLTLIBRARIES \ install-info install-info-am install-kde_moduleLTLIBRARIES \
install-kdisplay_colorschemeDATA install-linkDATA install-man \ install-tdedisplay_colorschemeDATA install-linkDATA install-man \
install-strip installcheck installcheck-am installdirs \ install-strip installcheck installcheck-am installdirs \
installdirs-am maintainer-clean maintainer-clean-generic \ installdirs-am maintainer-clean maintainer-clean-generic \
maintainer-clean-recursive mostlyclean mostlyclean-compile \ maintainer-clean-recursive mostlyclean mostlyclean-compile \
@ -836,19 +836,19 @@ uninstall-info: uninstall-info-recursive
pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
uninstall-confDATA uninstall-info-am \ uninstall-confDATA uninstall-info-am \
uninstall-kde_moduleLTLIBRARIES \ uninstall-kde_moduleLTLIBRARIES \
uninstall-kdisplay_colorschemeDATA uninstall-linkDATA uninstall-tdedisplay_colorschemeDATA uninstall-linkDATA
# 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:
#>+ 8 #>+ 8
kwin3_MachBunt.la.closure: $(kwin3_MachBunt_la_OBJECTS) $(kwin3_MachBunt_la_DEPENDENCIES) twin3_MachBunt.la.closure: $(twin3_MachBunt_la_OBJECTS) $(twin3_MachBunt_la_DEPENDENCIES)
@echo "int main() {return 0;}" > kwin3_MachBunt_la_closure.cpp @echo "int main() {return 0;}" > twin3_MachBunt_la_closure.cpp
@$(LTCXXCOMPILE) -c kwin3_MachBunt_la_closure.cpp @$(LTCXXCOMPILE) -c twin3_MachBunt_la_closure.cpp
$(CXXLINK) kwin3_MachBunt_la_closure.lo $(kwin3_MachBunt_la_LDFLAGS) $(kwin3_MachBunt_la_OBJECTS) $(kwin3_MachBunt_la_LIBADD) $(LIBS) $(CXXLINK) twin3_MachBunt_la_closure.lo $(twin3_MachBunt_la_LDFLAGS) $(twin3_MachBunt_la_OBJECTS) $(twin3_MachBunt_la_LIBADD) $(LIBS)
@rm -f kwin3_MachBunt_la_closure.* kwin3_MachBunt.la.closure @rm -f twin3_MachBunt_la_closure.* twin3_MachBunt.la.closure
@echo "timestamp" > kwin3_MachBunt.la.closure @echo "timestamp" > twin3_MachBunt.la.closure
#>+ 3 #>+ 3
@ -863,11 +863,11 @@ clean-metasources:
-rm -f MachBunt.moc -rm -f MachBunt.moc
#>+ 2 #>+ 2
KDE_DIST=middle_button_left.xpm Makefile.in MachBunt.kcsrc kwinMachBuntrc buttons.h middle.xcf middle_button.xpm middle_button_right.xpm kroete.xcf middle.xpm kroete.xpm middle_button_side.xcf right.xpm MachBunt.desktop left.xpm bar.xpm Makefile.am side.xcf KDE_DIST=middle_button_left.xpm Makefile.in MachBunt.kcsrc twinMachBuntrc buttons.h middle.xcf middle_button.xpm middle_button_right.xpm kroete.xcf middle.xpm kroete.xpm middle_button_side.xcf right.xpm MachBunt.desktop left.xpm bar.xpm Makefile.am side.xcf
#>+ 3 #>+ 3
clean-closures: clean-closures:
-rm -f kwin3_MachBunt.la.closure -rm -f twin3_MachBunt.la.closure
#>+ 2 #>+ 2
docs-am: docs-am:
@ -911,36 +911,36 @@ bcheck-am:
#>+ 11 #>+ 11
kwin3_MachBunt_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/MachBunt.cpp $(srcdir)/MachBuntButton.cpp MachBunt.moc twin3_MachBunt_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/MachBunt.cpp $(srcdir)/MachBuntButton.cpp MachBunt.moc
@echo 'creating kwin3_MachBunt_la.all_cpp.cpp ...'; \ @echo 'creating twin3_MachBunt_la.all_cpp.cpp ...'; \
rm -f kwin3_MachBunt_la.all_cpp.files kwin3_MachBunt_la.all_cpp.final; \ rm -f twin3_MachBunt_la.all_cpp.files twin3_MachBunt_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kwin3_MachBunt_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> twin3_MachBunt_la.all_cpp.final; \
for file in MachBunt.cpp MachBuntButton.cpp ; do \ for file in MachBunt.cpp MachBuntButton.cpp ; do \
echo "#include \"$$file\"" >> kwin3_MachBunt_la.all_cpp.files; \ echo "#include \"$$file\"" >> twin3_MachBunt_la.all_cpp.files; \
test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwin3_MachBunt_la.all_cpp.final; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> twin3_MachBunt_la.all_cpp.final; \
done; \ done; \
cat kwin3_MachBunt_la.all_cpp.final kwin3_MachBunt_la.all_cpp.files > kwin3_MachBunt_la.all_cpp.cpp; \ cat twin3_MachBunt_la.all_cpp.final twin3_MachBunt_la.all_cpp.files > twin3_MachBunt_la.all_cpp.cpp; \
rm -f kwin3_MachBunt_la.all_cpp.final kwin3_MachBunt_la.all_cpp.files rm -f twin3_MachBunt_la.all_cpp.final twin3_MachBunt_la.all_cpp.files
#>+ 3 #>+ 3
clean-final: clean-final:
-rm -f kwin3_MachBunt_la.all_cpp.cpp -rm -f twin3_MachBunt_la.all_cpp.cpp
#>+ 3 #>+ 3
final: final:
$(MAKE) kwin3_MachBunt_la_OBJECTS="$(kwin3_MachBunt_la_final_OBJECTS)" all-am $(MAKE) twin3_MachBunt_la_OBJECTS="$(twin3_MachBunt_la_final_OBJECTS)" all-am
#>+ 3 #>+ 3
final-install: final-install:
$(MAKE) kwin3_MachBunt_la_OBJECTS="$(kwin3_MachBunt_la_final_OBJECTS)" install-am $(MAKE) twin3_MachBunt_la_OBJECTS="$(twin3_MachBunt_la_final_OBJECTS)" install-am
#>+ 3 #>+ 3
no-final: no-final:
$(MAKE) kwin3_MachBunt_la_OBJECTS="$(kwin3_MachBunt_la_nofinal_OBJECTS)" all-am $(MAKE) twin3_MachBunt_la_OBJECTS="$(twin3_MachBunt_la_nofinal_OBJECTS)" all-am
#>+ 3 #>+ 3
no-final-install: no-final-install:
$(MAKE) kwin3_MachBunt_la_OBJECTS="$(kwin3_MachBunt_la_nofinal_OBJECTS)" install-am $(MAKE) twin3_MachBunt_la_OBJECTS="$(twin3_MachBunt_la_nofinal_OBJECTS)" install-am
#>+ 3 #>+ 3
kde-rpo-clean: kde-rpo-clean:

Write Preview
Loading…
Cancel
Save