@ -23,8 +23,8 @@ dnl IMPORTANT NOTE:
dnl Please do not modify this file unless you expect your modifications to be
dnl carried into every other module in the repository.
dnl
dnl Single-module modifications are best placed in configure.in for k delibs
dnl and k debase or configure.in.in if present.
dnl Single-module modifications are best placed in configure.in for t delibs
dnl and t debase or configure.in.in if present.
# KDE_PATH_X_DIRECT
dnl Internal subroutine of AC_PATH_X.
@ -103,41 +103,41 @@ ac_x_libraries=],
[LIBS="$ac_save_LIBS"
# First see if replacing the include by lib works.
# Check X11 before X11Rn because it is often a symlink to the current release.
for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${k delibsuff}/` \
/usr/X11/lib${k delibsuff} \
/usr/X11R6/lib${k delibsuff} \
/usr/X11R5/lib${k delibsuff} \
/usr/X11R4/lib${k delibsuff} \
for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${t delibsuff}/` \
/usr/X11/lib${t delibsuff} \
/usr/X11R6/lib${t delibsuff} \
/usr/X11R5/lib${t delibsuff} \
/usr/X11R4/lib${t delibsuff} \
\
/usr/lib${k delibsuff}/X11 \
/usr/lib${k delibsuff}/X11R6 \
/usr/lib${k delibsuff}/X11R5 \
/usr/lib${k delibsuff}/X11R4 \
/usr/lib${t delibsuff}/X11 \
/usr/lib${t delibsuff}/X11R6 \
/usr/lib${t delibsuff}/X11R5 \
/usr/lib${t delibsuff}/X11R4 \
\
/usr/local/X11/lib${k delibsuff} \
/usr/local/X11R6/lib${k delibsuff} \
/usr/local/X11R5/lib${k delibsuff} \
/usr/local/X11R4/lib${k delibsuff} \
/usr/local/X11/lib${t delibsuff} \
/usr/local/X11R6/lib${t delibsuff} \
/usr/local/X11R5/lib${t delibsuff} \
/usr/local/X11R4/lib${t delibsuff} \
\
/usr/local/lib${k delibsuff}/X11 \
/usr/local/lib${k delibsuff}/X11R6 \
/usr/local/lib${k delibsuff}/X11R5 \
/usr/local/lib${k delibsuff}/X11R4 \
/usr/local/lib${t delibsuff}/X11 \
/usr/local/lib${t delibsuff}/X11R6 \
/usr/local/lib${t delibsuff}/X11R5 \
/usr/local/lib${t delibsuff}/X11R4 \
\
/usr/X386/lib${k delibsuff} \
/usr/x386/lib${k delibsuff} \
/usr/XFree86/lib${k delibsuff}/X11 \
/usr/X386/lib${t delibsuff} \
/usr/x386/lib${t delibsuff} \
/usr/XFree86/lib${t delibsuff}/X11 \
\
/usr/lib${k delibsuff} \
/usr/local/lib${k delibsuff} \
/usr/unsupported/lib${k delibsuff} \
/usr/athena/lib${k delibsuff} \
/usr/local/x11r5/lib${k delibsuff} \
/usr/lpp/Xamples/lib${k delibsuff} \
/lib/usr/lib${k delibsuff}/X11 \
/usr/lib${t delibsuff} \
/usr/local/lib${t delibsuff} \
/usr/unsupported/lib${t delibsuff} \
/usr/athena/lib${t delibsuff} \
/usr/local/x11r5/lib${t delibsuff} \
/usr/lpp/Xamples/lib${t delibsuff} \
/lib/usr/lib${t delibsuff}/X11 \
\
/usr/openwin/lib${k delibsuff} \
/usr/openwin/share/lib${k delibsuff} \
/usr/openwin/lib${t delibsuff} \
/usr/openwin/share/lib${t delibsuff} \
; \
do
dnl Don't even attempt the hair of trying to link an X program!
@ -371,24 +371,24 @@ AC_DEFUN([KDE_1_CHECK_PATHS],
fi
AC_MSG_CHECKING([for KDE libraries installed])
ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lk decore $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 -lt decore $LIBQT $KDE_TEST_RPATH 1>&5'
if AC_TRY_EVAL(ac_link) && test -s conftest; then
AC_MSG_RESULT(yes)
else
AC_MSG_ERROR([your system fails at linking a small KDE application!
Check, if your compiler is installed correctly and if you have used the
same compiler to compile Qt and k delibs as you did use now.
same compiler to compile Qt and t delibs as you did use now.
For more details about this problem, look at the end of config.log.])
fi
if eval `K DEDIR= ./conftest 2>&5`; then
if eval `T DEDIR= ./conftest 2>&5`; then
kde_result=done
else
kde_result=problems
fi
K DEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
T DEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
kde_have_all_paths=yes
KDE_SET_PATHS($kde_result)
@ -547,11 +547,11 @@ Please check whether you installed aRts correctly or use
AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
[
kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
test -n "$KDEDIR" && kde_default_bindirs="$K DEDIR/bin $kde_default_bindirs"
if test -n "$K DEDIRS"; then
test -n "$TDEDIR" && kde_default_bindirs="$T DEDIR/bin $kde_default_bindirs"
if test -n "$T DEDIRS"; then
kde_save_IFS=$IFS
IFS=:
for dir in $K DEDIRS; do
for dir in $T DEDIRS; do
kde_default_bindirs="$dir/bin $kde_default_bindirs "
done
IFS=$kde_save_IFS
@ -602,18 +602,18 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi
if test -n "$kde32ornewer"; then
KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(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)])
fi
if test -n "$kde33ornewer"; then
KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makek dewidgets)])
KDE_FIND_PATH(maketdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(maket dewidgets)])
AC_SUBST(MAKEKDEWIDGETS)
fi
KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
test -n "$KDEDIR" && kde_sharedirs="$K DEDIR/share $kde_sharedirs"
test -n "$TDEDIR" && kde_sharedirs="$T DEDIR/share $kde_sharedirs"
AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
if test "$KDE_XSL_STYLESHEET" = "NO"; then
KDE_XSL_STYLESHEET=""
@ -710,7 +710,7 @@ AC_SUBST(kde_templatesdir)
AC_SUBST(kde_servicesdir)
AC_SUBST(kde_servicetypesdir)
AC_SUBST(kde_moduledir)
AC_SUBST(k deinitdir, '$(kde_moduledir)')
AC_SUBST(t deinitdir, '$(kde_moduledir)')
AC_SUBST(kde_styledir)
AC_SUBST(kde_widgetdir)
if test "$kde_qtver" = 1; then
@ -937,7 +937,7 @@ mips-sgi-irix6*)
ac_x_includes="."
fi
if test -z "$ac_x_libraries"; then
ac_x_libraries="/usr/lib${k delibsuff}"
ac_x_libraries="/usr/lib${t delibsuff}"
fi
esac
#from now on we use our own again
@ -1418,7 +1418,7 @@ qt_includes=""
AC_ARG_WITH(qt-dir,
AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]),
[ ac_qt_includes="$withval"/include
ac_qt_libraries="$withval"/lib${k delibsuff}
ac_qt_libraries="$withval"/lib${t delibsuff}
ac_qt_bindir="$withval"/bin
])
@ -1459,7 +1459,7 @@ ac_qt_includes="$qt_incdir"
qt_libdirs=""
for dir in $kde_qt_dirs; do
qt_libdirs="$qt_libdirs $dir/lib${k delibsuff} $dir"
qt_libdirs="$qt_libdirs $dir/lib${t delibsuff} $dir"
done
qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
if test ! "$ac_qt_libraries" = "NO"; then
@ -1644,11 +1644,11 @@ rm -f actest.ui actest.cpp
AC_MSG_RESULT([$kde_cv_uic_plugins])
if test "$kde_cv_uic_plugins" != yes; then
AC_MSG_ERROR([
you need to install k delibs first.
you need to install t delibs first.
If you did install k delibs, then the Qt version that is picked up by
this configure is not the same version you used to compile k delibs.
The Qt Plugin installed by k delibs is *ONLY* loadable if it is the
If you did install t delibs, then the Qt version that is picked up by
this configure is not the same version you used to compile t delibs.
The Qt Plugin installed by t delibs is *ONLY* loadable if it is the
_same Qt version_, compiled with the _same compiler_ and the same Qt
configuration settings.
])
@ -1785,16 +1785,16 @@ AC_CACHE_VAL(ac_cv_have_kde,
if test "$kde_qtver" = 1; then
kde_check_header="ksock.h"
kde_check_lib="libk decore.la"
kde_check_lib="libt decore.la"
else
kde_check_header="ksharedptr.h"
kde_check_lib="libk io.la"
kde_check_lib="libtde io.la"
fi
if test -z "$1"; then
kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/k de /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $K DEDIR $kde_incdirs"
kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/t de /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $T DEDIR $kde_incdirs"
kde_incdirs="$ac_kde_includes $kde_incdirs"
AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
ac_kde_includes="$kde_incdir"
@ -1805,8 +1805,8 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail.
So, check this please and use another prefix!])
fi
kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${k delibsuff}"
test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $K DEDIR $kde_libdirs"
kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${t delibsuff}"
test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $T DEDIR $kde_libdirs"
kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
ac_kde_libraries="$kde_libdir"
@ -1824,7 +1824,7 @@ fi
if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
AC_MSG_ERROR([
I can't find the designer plugins. These are required and should have been installed
by k delibs])
by t delibs])
fi
if test -n "$kde_widgetdir"; then
@ -1839,7 +1839,7 @@ else
ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
fi
else dnl test -z $1, e.g. from k delibs
else dnl test -z $1, e.g. from t delibs
ac_cv_have_kde="have_kde=no"
@ -1979,20 +1979,20 @@ cat > conftest.$ac_ext <<EOF
#include <kapp.h>
int main() {
printf("kde_htmldir=\\"%s\\"\n", K Application::kde_htmldir().data());
printf("kde_appsdir=\\"%s\\"\n", K Application::kde_appsdir().data());
printf("kde_icondir=\\"%s\\"\n", K Application::kde_icondir().data());
printf("kde_sounddir=\\"%s\\"\n", K Application::kde_sounddir().data());
printf("kde_datadir=\\"%s\\"\n", K Application::kde_datadir().data());
printf("kde_locale=\\"%s\\"\n", K Application::kde_localedir().data());
printf("kde_cgidir=\\"%s\\"\n", K Application::kde_cgidir().data());
printf("kde_confdir=\\"%s\\"\n", K Application::kde_configdir().data());
printf("kde_mimedir=\\"%s\\"\n", K Application::kde_mimedir().data());
printf("kde_toolbardir=\\"%s\\"\n", K Application::kde_toolbardir().data());
printf("kde_htmldir=\\"%s\\"\n", TDE Application::kde_htmldir().data());
printf("kde_appsdir=\\"%s\\"\n", TDE Application::kde_appsdir().data());
printf("kde_icondir=\\"%s\\"\n", TDE Application::kde_icondir().data());
printf("kde_sounddir=\\"%s\\"\n", TDE Application::kde_sounddir().data());
printf("kde_datadir=\\"%s\\"\n", TDE Application::kde_datadir().data());
printf("kde_locale=\\"%s\\"\n", TDE Application::kde_localedir().data());
printf("kde_cgidir=\\"%s\\"\n", TDE Application::kde_cgidir().data());
printf("kde_confdir=\\"%s\\"\n", TDE Application::kde_configdir().data());
printf("kde_mimedir=\\"%s\\"\n", TDE Application::kde_mimedir().data());
printf("kde_toolbardir=\\"%s\\"\n", TDE Application::kde_toolbardir().data());
printf("kde_wallpaperdir=\\"%s\\"\n",
K Application::kde_wallpaperdir().data());
printf("kde_bindir=\\"%s\\"\n", K Application::kde_bindir().data());
printf("kde_partsdir=\\"%s\\"\n", K Application::kde_partsdir().data());
TDE Application::kde_wallpaperdir().data());
printf("kde_bindir=\\"%s\\"\n", TDE Application::kde_bindir().data());
printf("kde_partsdir=\\"%s\\"\n", TDE Application::kde_partsdir().data());
printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
printf("kde_moduledir=\\"/tmp/dummy\\"\n");
@ -2030,7 +2030,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
kde_cxxflags_safe="$CXXFLAGS"
LIBS="-lkde-qt-addon $LIBQT $LIBS"
CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/k de $all_includes"
CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/t de $all_includes"
LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
AC_TRY_LINK([
@ -2064,48 +2064,48 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
if test $kde_qtver = 3; then
case $host in
*cygwin*) lib_kded="-lk deinit_kded" ;;
*cygwin*) lib_kded="-lt deinit_kded" ;;
*) lib_kded="" ;;
esac
AC_SUBST(LIB_KDED, $lib_kded)
AC_SUBST(LIB_KDECORE, "-lk decore")
AC_SUBST(LIB_KDEUI, "-lk deui")
AC_SUBST(LIB_KIO, "-lk io")
AC_SUBST(LIB_TDECORE, "-lt decore")
AC_SUBST(LIB_TDEUI, "-lt deui")
AC_SUBST(LIB_KIO, "-ltde io")
AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lk abc")
AC_SUBST(LIB_KHTML, "-lk html")
AC_SUBST(LIB_KSPELL, "-lk spell")
AC_SUBST(LIB_KPARTS, "-lk parts")
AC_SUBST(LIB_KDEPRINT, "-lk deprint")
AC_SUBST(LIB_KUTILS, "-lk utils")
AC_SUBST(LIB_KDEPIM, "-lk depim")
AC_SUBST(LIB_KIMPROXY, "-lk improxy")
AC_SUBST(LIB_KABC, "-ltde abc")
AC_SUBST(LIB_TDEHTML, "-ltde html")
AC_SUBST(LIB_KSPELL, "-ltde spell")
AC_SUBST(LIB_KPARTS, "-ltde parts")
AC_SUBST(LIB_TDEPRINT, "-lt deprint")
AC_SUBST(LIB_KUTILS, "-ltde utils")
AC_SUBST(LIB_TDEPIM, "-lt depim")
AC_SUBST(LIB_KIMPROXY, "-ltde improxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-lk dnssd")
AC_SUBST(LIB_KUNITTEST, "-lk unittest")
AC_SUBST(LIB_KDNSSD, "-ltde dnssd")
AC_SUBST(LIB_KUNITTEST, "-ltde unittest")
# these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-lk io")
AC_SUBST(LIB_KFILE, "-lk io")
AC_SUBST(LIB_KSYCOCA, "-ltde io")
AC_SUBST(LIB_KFILE, "-ltde io")
elif test $kde_qtver = 2; then
AC_SUBST(LIB_KDECORE, "-lk decore")
AC_SUBST(LIB_KDEUI, "-lk deui")
AC_SUBST(LIB_KIO, "-lk io")
AC_SUBST(LIB_KSYCOCA, "-lk sycoca")
AC_SUBST(LIB_TDECORE, "-lt decore")
AC_SUBST(LIB_TDEUI, "-lt deui")
AC_SUBST(LIB_KIO, "-ltde io")
AC_SUBST(LIB_KSYCOCA, "-ltde sycoca")
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-lk file")
AC_SUBST(LIB_KFILE, "-ltde file")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-lk html")
AC_SUBST(LIB_KSPELL, "-lk spell")
AC_SUBST(LIB_KPARTS, "-lk parts")
AC_SUBST(LIB_KDEPRINT, "-lk deprint")
AC_SUBST(LIB_TDEHTML, "-ltde html")
AC_SUBST(LIB_KSPELL, "-ltde spell")
AC_SUBST(LIB_KPARTS, "-ltde parts")
AC_SUBST(LIB_TDEPRINT, "-lt deprint")
else
AC_SUBST(LIB_KDECORE, "-lk decore -lXext $(LIB_QT)")
AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_K DECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_K DECORE)")
AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_K DEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_K DECORE)")
AC_SUBST(LIB_TDECORE, "-lt decore -lXext $(LIB_QT)")
AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_T DECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_T DECORE)")
AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_T DEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_T DECORE)")
fi
])
@ -2170,7 +2170,7 @@ if test "x$kde_cv_func_$1" = xyes; then
else
case "$1" in
setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
kde_cv_proto_$1="yes - in libk defakes"
kde_cv_proto_$1="yes - in libt defakes"
;;
*)
kde_cv_proto_$1=unknown
@ -2489,7 +2489,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
AC_MSG_RESULT(yes)
AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
else
AC_MSG_ERROR(You need giflib30. Please install the k desupport package)
AC_MSG_ERROR(You need giflib30. Please install the t desupport package)
fi
])
@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
test "x$jpeg_incdir" = xNO && jpeg_incdir=
dnl if headers _and_ libraries are missing, this is no error, and we
dnl continue with a warning (the user will get no jpeg support in 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 only warn
if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@ -3447,7 +3447,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
AC_SUBST(KDE_PLUGIN)
# This hack ensures that libtool creates shared libs for 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)"
AC_SUBST(KDE_CHECK_PLUGIN)
@ -3457,29 +3457,29 @@ AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch config
AC_DEFUN([KDE_CHECK_LIB64],
[
k delibsuff="$kde_libs_suffix"
if test -z "$k delibsuff"; then
k delibsuff=no
t delibsuff="$kde_libs_suffix"
if test -z "$t delibsuff"; then
t delibsuff=no
fi
AC_ARG_ENABLE(libsuffix,
AC_HELP_STRING([--enable-libsuffix],
[/lib directory suffix (64,32,none[=default])]),
k delibsuff=$enableval)
t delibsuff=$enableval)
# TODO: add an auto case that compiles a little C app to check
# where the glibc is
if test "$k delibsuff" = "no"; then
k delibsuff=
if test "$t delibsuff" = "no"; then
t delibsuff=
fi
if test -z "$k delibsuff"; then
if test -z "$t delibsuff"; then
AC_MSG_RESULT([not using lib directory suffix])
AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories)
else
if test "$libdir" = '${exec_prefix}/lib'; then
libdir="$libdir${k delibsuff}"
libdir="$libdir${t delibsuff}"
AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms
fi
AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${k delibsuff}"], Suffix for lib directories)
AC_MSG_RESULT([using lib directory suffix $k delibsuff])
AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${t delibsuff}"], Suffix for lib directories)
AC_MSG_RESULT([using lib directory suffix $t delibsuff])
fi
])
@ -3497,7 +3497,7 @@ AC_CANONICAL_SYSTEM
AC_ARG_PROGRAM
AM_INIT_AUTOMAKE($1, $2)
AM_DISABLE_LIBRARIES
AC_PREFIX_DEFAULT(${K DEDIR:-/usr/local/kde})
AC_PREFIX_DEFAULT(${T DEDIR:-/usr/local/kde})
AC_CHECK_COMPILERS
KDE_PROG_LIBTOOL
AM_KDE_WITH_NLS
@ -4504,7 +4504,7 @@ fi
PYTHONINC=-I$python_incdir
python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$k delibsuff $kde_extra_libs"
python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$t delibsuff $kde_extra_libs"
AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir)
if test ! -r $python_libdir/libpython$version.so; then
AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)
@ -4892,14 +4892,14 @@ AC_DEFUN([KDE_CONF_FILES],
AC_SUBST(CONF_FILES)
])dnl
dnl This sets the prefix, for arts and k delibs
dnl This sets the prefix, for arts and t delibs
dnl Do NOT use in any other module.
dnl It only looks at --prefix, K DEDIR and falls back to /usr/local/kde
dnl It only looks at --prefix, T DEDIR and falls back to /usr/local/kde
AC_DEFUN([KDE_SET_PREFIX_CORE],
[
unset CDPATH
dnl make $K DEDIR the default for the installation
AC_PREFIX_DEFAULT(${K DEDIR:-/usr/local/kde})
dnl make $T DEDIR the default for the installation
AC_PREFIX_DEFAULT(${T DEDIR:-/usr/local/kde})
if test "x$prefix" = "xNONE"; then
prefix=$ac_default_prefix
@ -4923,25 +4923,25 @@ AC_DEFUN([KDE_SET_PREFIX],
unset CDPATH
dnl We can't give real code to that macro, only a value.
dnl It only matters for --help, since we set the prefix in this function anyway.
AC_PREFIX_DEFAULT(${K DEDIR:-the kde prefix})
AC_PREFIX_DEFAULT(${T DEDIR:-the kde prefix})
KDE_SET_DEFAULT_BINDIRS
if test "x$prefix" = "xNONE"; then
dnl no prefix given: look for k de-config in the PATH and deduce the prefix from it
KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(k de-config)], [], prepend)
dnl no prefix given: look for t de-config in the PATH and deduce the prefix from it
KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(t de-config)], [], prepend)
else
dnl prefix given: look for k de-config, preferrably in prefix, otherwise in PATH
dnl prefix given: look for t de-config, preferrably in prefix, otherwise in PATH
kde_save_PATH="$PATH"
PATH="$exec_prefix/bin:$prefix/bin:$PATH"
KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(k de-config)], [], prepend)
KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(t de-config)], [], prepend)
PATH="$kde_save_PATH"
fi
kde_libs_prefix=`$KDECONFIG --prefix`
if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for k delibs.
AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for t delibs.
This means it has been moved since you installed it.
This won't work. Please recompile k delibs for the new prefix.
This won't work. Please recompile t delibs for the new prefix.
])
fi
kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
@ -4950,7 +4950,7 @@ AC_DEFUN([KDE_SET_PREFIX],
AC_MSG_CHECKING([where to install])
if test "x$prefix" = "xNONE"; then
prefix=$kde_libs_prefix
AC_MSG_RESULT([$prefix (as returned by k de-config)])
AC_MSG_RESULT([$prefix (as returned by t de-config)])
else
dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different
given_prefix=$prefix
@ -5607,7 +5607,7 @@ ssl_includes=""
AC_ARG_WITH(ssl-dir,
AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]),
[ ac_ssl_includes="$withval"/include
ac_ssl_libraries="$withval"/lib$k delibsuff
ac_ssl_libraries="$withval"/lib$t delibsuff
])
want_ssl=yes
@ -5627,7 +5627,7 @@ AC_CACHE_VAL(ac_cv_have_ssl,
AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir)
ac_ssl_includes="$ssl_incdir"
ssl_libdirs="/usr/lib$kdelibsuff /usr/local/lib$kdelibsuff /usr/ssl/lib$kdelibsuff /usr/local/ssl/lib$kdelibsuff $libdir $prefix/lib$kdelibsuff $exec_prefix/lib$k delibsuff $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$t delibsuff $kde_extra_libs"
if test ! "$ac_ssl_libraries" = "NO"; then
ssl_libdirs="$ac_ssl_libraries $ssl_libdirs"
fi
@ -5864,9 +5864,9 @@ dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page
dnl also defines KSTUFF_PKG_ERRORS on error
AC_DEFUN([KDE_PKG_CHECK_MODULES], [
PKG_CONFIG_PATH="$prefix/lib${k delibsuff}/pkgconfig:$PKG_CONFIG_PATH"
PKG_CONFIG_PATH="$prefix/lib${t delibsuff}/pkgconfig:$PKG_CONFIG_PATH"
if test "$prefix" != "$kde_libs_prefix"; then
PKG_CONFIG_PATH="$kde_libs_prefix/lib${k delibsuff}/pkgconfig:$PKG_CONFIG_PATH"
PKG_CONFIG_PATH="$kde_libs_prefix/lib${t delibsuff}/pkgconfig:$PKG_CONFIG_PATH"
fi
export PKG_CONFIG_PATH
PKG_CHECK_MODULES($1,$2,$3,$4)
