@ -244,9 +244,9 @@ AC_DEFUN([KDE_FIND_PATH],
AC_DEFUN([KDE_MOC_ERROR_MESSAGE],
AC_DEFUN([KDE_MOC_ERROR_MESSAGE],
[
[
AC_MSG_ERROR([No Qt meta object compiler (moc) found!
AC_MSG_ERROR([No T Qt meta object compiler (tq moc) found!
Please check whether you installed Qt correctly.
Please check whether you installed Qt correctly.
You need to have a running moc binary.
You need to have a running tq moc binary.
configure tried to run $ac_cv_path_moc and the test didn't
configure tried to run $ac_cv_path_moc and the test didn't
succeed. If configure shouldn't have tried this one, set
succeed. If configure shouldn't have tried this one, set
the environment variable MOC to the right one before running
the environment variable MOC to the right one before running
@ -268,8 +268,8 @@ configure.
AC_DEFUN([KDE_UIC_ERROR_MESSAGE],
AC_DEFUN([KDE_UIC_ERROR_MESSAGE],
[
[
AC_MSG_WARN([No Qt ui compiler (uic) found!
AC_MSG_WARN([No T Qt ui compiler (tq uic) found!
Please check whether you installed Qt correctly.
Please check whether you installed T Qt correctly.
You need to have a running uic binary.
You need to have a running uic binary.
configure tried to run $ac_cv_path_uic and the test didn't
configure tried to run $ac_cv_path_uic and the test didn't
succeed. If configure shouldn't have tried this one, set
succeed. If configure shouldn't have tried this one, set
@ -334,7 +334,7 @@ AC_DEFUN([AC_PATH_QT_MOC_UIC],
qt_bindirs="/usr/share/qt4/bin $qt_bindirs"
qt_bindirs="/usr/share/qt4/bin $qt_bindirs"
fi
fi
KDE_FIND_PATH(moc, MOC, [$qt_bindirs], [KDE_MOC_ERROR_MESSAGE])
KDE_FIND_PATH(tq moc, MOC, [$qt_bindirs], [KDE_MOC_ERROR_MESSAGE])
if test -z "$UIC_NOT_NEEDED"; then
if test -z "$UIC_NOT_NEEDED"; then
if test $kde_qtver = 3; then
if test $kde_qtver = 3; then
KDE_FIND_PATH(uic-tqt, UIC_PATH, [$qt_bindirs], [UIC_PATH=""])
KDE_FIND_PATH(uic-tqt, UIC_PATH, [$qt_bindirs], [UIC_PATH=""])
@ -636,7 +636,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi
fi
if test -n "$trinity14ornewer"; then
if test -n "$trinity14ornewer"; then
KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(k config_compiler)])
KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde config_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)])
KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)])
KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)])
AC_SUBST(MAKEKDEWIDGETS)
AC_SUBST(MAKEKDEWIDGETS)
@ -2007,7 +2007,7 @@ if test "$kde_qtver" = 1; then
kde_check_lib="libtdecore.la"
kde_check_lib="libtdecore.la"
else
else
kde_check_header="ksharedptr.h"
kde_check_header="ksharedptr.h"
kde_check_lib="libk io.la"
kde_check_lib="libtde io.la"
fi
fi
if test -z "$1"; then
if test -z "$1"; then
@ -2198,20 +2198,20 @@ cat > conftest.$ac_ext <<EOF
#include <kapp.h>
#include <kapp.h>
int main() {
int main() {
printf("kde_htmldir=\\"%s\\"\n", K Application::kde_htmldir().data());
printf("kde_htmldir=\\"%s\\"\n", TDE Application::kde_htmldir().data());
printf("kde_appsdir=\\"%s\\"\n", K Application::kde_appsdir().data());
printf("kde_appsdir=\\"%s\\"\n", TDE Application::kde_appsdir().data());
printf("kde_icondir=\\"%s\\"\n", K Application::kde_icondir().data());
printf("kde_icondir=\\"%s\\"\n", TDE Application::kde_icondir().data());
printf("kde_sounddir=\\"%s\\"\n", K Application::kde_sounddir().data());
printf("kde_sounddir=\\"%s\\"\n", TDE Application::kde_sounddir().data());
printf("kde_datadir=\\"%s\\"\n", K Application::kde_datadir().data());
printf("kde_datadir=\\"%s\\"\n", TDE Application::kde_datadir().data());
printf("kde_locale=\\"%s\\"\n", K Application::kde_localedir().data());
printf("kde_locale=\\"%s\\"\n", TDE Application::kde_localedir().data());
printf("kde_cgidir=\\"%s\\"\n", K Application::kde_cgidir().data());
printf("kde_cgidir=\\"%s\\"\n", TDE Application::kde_cgidir().data());
printf("kde_confdir=\\"%s\\"\n", K Application::kde_configdir().data());
printf("kde_confdir=\\"%s\\"\n", TDE Application::kde_configdir().data());
printf("kde_mimedir=\\"%s\\"\n", K Application::kde_mimedir().data());
printf("kde_mimedir=\\"%s\\"\n", TDE Application::kde_mimedir().data());
printf("kde_toolbardir=\\"%s\\"\n", K Application::kde_toolbardir().data());
printf("kde_toolbardir=\\"%s\\"\n", TDE Application::kde_toolbardir().data());
printf("kde_wallpaperdir=\\"%s\\"\n",
printf("kde_wallpaperdir=\\"%s\\"\n",
K Application::kde_wallpaperdir().data());
TDE Application::kde_wallpaperdir().data());
printf("kde_bindir=\\"%s\\"\n", K Application::kde_bindir().data());
printf("kde_bindir=\\"%s\\"\n", TDE Application::kde_bindir().data());
printf("kde_partsdir=\\"%s\\"\n", K Application::kde_partsdir().data());
printf("kde_partsdir=\\"%s\\"\n", TDE Application::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");
@ -2315,24 +2315,24 @@ if test $kde_qtver = 4; then
AC_SUBST(LIB_KDED, $lib_kded)
AC_SUBST(LIB_KDED, $lib_kded)
AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lk io")
AC_SUBST(LIB_KIO, "-ltde io")
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, "-lkabc")
AC_SUBST(LIB_KHTML, "-lk html")
AC_SUBST(LIB_TDEHTML, "-ltde html")
AC_SUBST(LIB_KSPELL, "-lk spell")
AC_SUBST(LIB_KSPELL, "-ltde spell")
AC_SUBST(LIB_KPARTS, "-lk parts")
AC_SUBST(LIB_KPARTS, "-ltde parts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-lk utils")
AC_SUBST(LIB_KUTILS, "-ltde utils")
AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-lk improxy")
AC_SUBST(LIB_KIMPROXY, "-ltde improxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-lk dnssd")
AC_SUBST(LIB_KDNSSD, "-ltde dnssd")
AC_SUBST(LIB_KUNITTEST, "-lk unittest")
AC_SUBST(LIB_KUNITTEST, "-ltde unittest")
# these are for backward compatibility
# these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-lk io")
AC_SUBST(LIB_KSYCOCA, "-ltde io")
AC_SUBST(LIB_KFILE, "-lk io")
AC_SUBST(LIB_TDEFILE, "-ltde io")
elif test $kde_qtver = 3; then
elif test $kde_qtver = 3; then
case $host in
case $host in
*cygwin*) lib_kded="-ltdeinit_kded" ;;
*cygwin*) lib_kded="-ltdeinit_kded" ;;
@ -2341,41 +2341,41 @@ elif test $kde_qtver = 3; then
AC_SUBST(LIB_KDED, $lib_kded)
AC_SUBST(LIB_KDED, $lib_kded)
AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lk io")
AC_SUBST(LIB_KIO, "-ltde io")
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, "-lkabc")
AC_SUBST(LIB_KHTML, "-lk html")
AC_SUBST(LIB_TDEHTML, "-ltde html")
AC_SUBST(LIB_KSPELL, "-lk spell")
AC_SUBST(LIB_KSPELL, "-ltde spell")
AC_SUBST(LIB_KPARTS, "-lk parts")
AC_SUBST(LIB_KPARTS, "-ltde parts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-lk utils")
AC_SUBST(LIB_KUTILS, "-ltde utils")
AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-lk improxy")
AC_SUBST(LIB_KIMPROXY, "-ltde improxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-lk dnssd")
AC_SUBST(LIB_KDNSSD, "-ltde dnssd")
AC_SUBST(LIB_KUNITTEST, "-lk unittest")
AC_SUBST(LIB_KUNITTEST, "-ltde unittest")
# these are for backward compatibility
# these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-lk io")
AC_SUBST(LIB_KSYCOCA, "-ltde io")
AC_SUBST(LIB_KFILE, "-lk io")
AC_SUBST(LIB_TDEFILE, "-ltde io")
elif test $kde_qtver = 2; then
elif test $kde_qtver = 2; then
AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lk io")
AC_SUBST(LIB_KIO, "-ltde io")
AC_SUBST(LIB_KSYCOCA, "-lk sycoca")
AC_SUBST(LIB_KSYCOCA, "-ltde sycoca")
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-lk file")
AC_SUBST(LIB_TDEFILE, "-ltde file")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-lk html")
AC_SUBST(LIB_TDEHTML, "-ltde html")
AC_SUBST(LIB_KSPELL, "-lk spell")
AC_SUBST(LIB_KSPELL, "-ltde spell")
AC_SUBST(LIB_KPARTS, "-lk parts")
AC_SUBST(LIB_KPARTS, "-ltde parts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else
else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
AC_SUBST(LIB_KFILE, "-lk file $(LIB_KFM) $(LIB_TDEUI)")
AC_SUBST(LIB_TDEFILE, "-ltde file $(LIB_KFM) $(LIB_TDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
fi
fi
])
])
@ -2823,7 +2823,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 k html)
dnl continue with a warning (the user will get no jpeg support in tde html)
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
@ -3890,7 +3890,7 @@ LIBTOOL_SHELL="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 k unittest plugins. By default check_LTLIBRARIES makes static libs.
# This hack ensures that libtool creates shared libs for tde unittest 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)
@ -4949,7 +4949,8 @@ fi
PYTHONINC=-I$python_incdir
PYTHONINC=-I$python_incdir
python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs"
python_multiarch_libdirs="`find /usr/lib/ -maxdepth 1 -type d | xargs echo`"
python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $python_multiarch_libdirs $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)
@ -5810,12 +5811,6 @@ if test "x$kde_java_bindir" != "xno"; then
dnl not needed for gcj compile
dnl not needed for gcj compile
if test "x$kde_java_libgcjdir" = "x"; then
if test ! -r "$kde_java_libhpidir/libhpi.so"; then
AC_MSG_ERROR([libhpi.so not found under $kde_java_libhpidir. Use --without-java.])
fi
fi
if test -n "$jni_includes"; then
if test -n "$jni_includes"; then
dnl Check for JNI version
dnl Check for JNI version
AC_LANG_SAVE
AC_LANG_SAVE
@ -5853,7 +5848,11 @@ if test "x$kde_java_bindir" != "xno"; then
JAR=$kde_java_bindir/jar
JAR=$kde_java_bindir/jar
AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
if test "x$kde_java_libgcjdir" = "x"; then
if test "x$kde_java_libgcjdir" = "x"; then
if test ! -r "$kde_java_libhpidir/libhpi.so"; then
JVMLIBS="-L$kde_java_libjvmdir -ljvm"
else
JVMLIBS="-L$kde_java_libjvmdir -ljvm -L$kde_java_libhpidir -lhpi"
JVMLIBS="-L$kde_java_libjvmdir -ljvm -L$kde_java_libhpidir -lhpi"
fi
else
else
JVMLIBS="-L$kde_java_libgcjdir -lgcj"
JVMLIBS="-L$kde_java_libgcjdir -lgcj"
fi
fi