|
|
|
@ -421,7 +421,7 @@ PACKAGE_STRING=
|
|
|
|
PACKAGE_BUGREPORT=
|
|
|
|
PACKAGE_BUGREPORT=
|
|
|
|
|
|
|
|
|
|
|
|
ac_unique_file="acinclude.m4"
|
|
|
|
ac_unique_file="acinclude.m4"
|
|
|
|
ac_default_prefix=${KDEDIR:-/usr/local/kde}
|
|
|
|
ac_default_prefix=${TDEDIR:-/usr/local/kde}
|
|
|
|
# Factoring default headers for most tests.
|
|
|
|
# Factoring default headers for most tests.
|
|
|
|
ac_includes_default="\
|
|
|
|
ac_includes_default="\
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
@ -459,7 +459,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 PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE WOVERLOADED_VIRTUAL USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS 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 LN_S ECHO RANLIB ac_ct_RANLIB EGREP LIBTOOL KDE_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL X_INCLUDES X_LDFLAGS x_libraries x_includes LIBSM X_PRE_LIBS LIB_X11 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 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 DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG KDECONFIG BROCKENBORING MEINPROC KDE_XSL_STYLESHEET kde_libs_prefix kde_libs_htmldir kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT 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 PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE WOVERLOADED_VIRTUAL USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS 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 LN_S ECHO RANLIB ac_ct_RANLIB EGREP LIBTOOL KDE_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL X_INCLUDES X_LDFLAGS x_libraries x_includes LIBSM X_PRE_LIBS LIB_X11 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 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 DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG KDECONFIG BROCKENBORING MEINPROC KDE_XSL_STYLESHEET kde_libs_prefix kde_libs_htmldir kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir tdeinitdir kde_styledir kde_widgetdir LIB_TDECORE LIB_TDEUI LIB_TDEIO LIB_SMB LIB_KAB LIB_KABC LIB_TDEHTML LIB_TDESPELL LIB_TDEPARTS LIB_TDEPRINT 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.
|
|
|
|
@ -6164,18 +6164,18 @@ fi;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
kdelibsuff=none
|
|
|
|
tdelibsuff=none
|
|
|
|
# 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;
|
|
|
|
# TODO: add an auto case that compiles a little C app to check
|
|
|
|
# TODO: add an auto case that compiles a little C app to check
|
|
|
|
# where the glibc is
|
|
|
|
# where the glibc is
|
|
|
|
if test "$kdelibsuff" = "none"; then
|
|
|
|
if test "$tdelibsuff" = "none"; then
|
|
|
|
kdelibsuff=
|
|
|
|
tdelibsuff=
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
if test -z "$kdelibsuff"; then
|
|
|
|
if test -z "$tdelibsuff"; then
|
|
|
|
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
|
|
|
|
|
|
|
|
|
|
|
|
@ -6185,16 +6185,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.
|
|
|
|
@ -17783,7 +17783,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
|
|
|
|
@ -18003,7 +18003,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
|
|
|
|
@ -22849,41 +22849,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
|
|
|
|
@ -22942,7 +22942,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
|
|
|
|
@ -24386,7 +24386,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;
|
|
|
|
@ -24450,7 +24450,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
|
|
|
|
@ -25205,12 +25205,12 @@ if test "${prefix}" != NONE; then
|
|
|
|
if test "${exec_prefix}" != NONE; then
|
|
|
|
if test "${exec_prefix}" != NONE; then
|
|
|
|
kde_libraries=${libdir}
|
|
|
|
kde_libraries=${libdir}
|
|
|
|
ac_kde_libraries=$libdir
|
|
|
|
ac_kde_libraries=$libdir
|
|
|
|
if test "$ac_kde_libraries" = '${exec_prefix}/lib'${kdelibsuff}; then
|
|
|
|
if test "$ac_kde_libraries" = '${exec_prefix}/lib'${tdelibsuff}; then
|
|
|
|
ac_kde_libraries=$exec_prefix/lib${kdelibsuff}
|
|
|
|
ac_kde_libraries=$exec_prefix/lib${tdelibsuff}
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
else
|
|
|
|
else
|
|
|
|
kde_libraries=${prefix}/lib${kdelibsuff}
|
|
|
|
kde_libraries=${prefix}/lib${tdelibsuff}
|
|
|
|
ac_kde_libraries=$prefix/lib${kdelibsuff}
|
|
|
|
ac_kde_libraries=$prefix/lib${tdelibsuff}
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
else
|
|
|
|
else
|
|
|
|
ac_kde_includes=
|
|
|
|
ac_kde_includes=
|
|
|
|
@ -25226,16 +25226,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="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
|
|
|
|
kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
|
|
|
|
test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
|
|
|
|
test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs"
|
|
|
|
kde_incdirs="$ac_kde_includes $kde_incdirs"
|
|
|
|
kde_incdirs="$ac_kde_includes $kde_incdirs"
|
|
|
|
|
|
|
|
|
|
|
|
kde_incdir=NO
|
|
|
|
kde_incdir=NO
|
|
|
|
@ -25264,8 +25264,8 @@ So, check this please and use another prefix!" >&2;}
|
|
|
|
{ (exit 1); exit 1; }; }
|
|
|
|
{ (exit 1); exit 1; }; }
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
kde_libdirs="/usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
|
|
|
|
kde_libdirs="/usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}"
|
|
|
|
test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
|
|
|
|
test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs"
|
|
|
|
kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
|
|
|
|
kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
|
|
|
|
|
|
|
|
|
|
|
|
kde_libdir=NO
|
|
|
|
kde_libdir=NO
|
|
|
|
@ -25289,7 +25289,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: 25294: $i/$j" >&5
|
|
|
|
echo "configure: 25294: $i/$j" >&5
|
|
|
|
if test -r "$i/$j"; then
|
|
|
|
if test -r "$i/$j"; then
|
|
|
|
@ -25311,13 +25311,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
|
|
|
|
|
|
|
|
|
|
|
|
@ -25447,8 +25447,8 @@ fi
|
|
|
|
echo "$as_me:$LINENO: result: $kde_cv_uic_plugins" >&5
|
|
|
|
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: you need to install kdelibs first." >&5
|
|
|
|
{ { echo "$as_me:$LINENO: error: you need to install tdelibs first." >&5
|
|
|
|
echo "$as_me: error: you need to install kdelibs first." >&2;}
|
|
|
|
echo "$as_me: error: you need to install tdelibs first." >&2;}
|
|
|
|
{ (exit 1); exit 1; }; }
|
|
|
|
{ (exit 1); exit 1; }; }
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
@ -25613,20 +25613,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");
|
|
|
|
@ -25685,7 +25685,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
|
|
|
|
@ -25697,22 +25697,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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -25901,20 +25901,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");
|
|
|
|
@ -25973,7 +25973,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
|
|
|
|
@ -25985,22 +25985,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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -26098,11 +26098,11 @@ fi
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
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
|
|
|
|
@ -26375,12 +26375,12 @@ echo "${ECHO_T}$kde_cv_path" >&6
|
|
|
|
|
|
|
|
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
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
|
|
|
|
@ -26396,16 +26396,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
|
|
|
|
@ -26492,12 +26492,12 @@ echo "${ECHO_T}$kde_cv_path" >&6
|
|
|
|
|
|
|
|
|
|
|
|
if test -n "$BROCKENBORING"; then
|
|
|
|
if test -n "$BROCKENBORING"; then
|
|
|
|
|
|
|
|
|
|
|
|
echo "$as_me:$LINENO: checking for kdeinit_wrapper" >&5
|
|
|
|
echo "$as_me:$LINENO: checking for tdeinit_wrapper" >&5
|
|
|
|
echo $ECHO_N "checking for kdeinit_wrapper... $ECHO_C" >&6
|
|
|
|
echo $ECHO_N "checking for tdeinit_wrapper... $ECHO_C" >&6
|
|
|
|
if test -n "$BROCKENBORING"; then
|
|
|
|
if test -n "$BROCKENBORING"; then
|
|
|
|
kde_cv_path="$BROCKENBORING";
|
|
|
|
kde_cv_path="$BROCKENBORING";
|
|
|
|
else
|
|
|
|
else
|
|
|
|
kde_cache=`echo kdeinit_wrapper | sed 'y%./+-%__p_%'`
|
|
|
|
kde_cache=`echo tdeinit_wrapper | 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
|
|
|
|
@ -26513,16 +26513,16 @@ else
|
|
|
|
IFS=$kde_save_IFS
|
|
|
|
IFS=$kde_save_IFS
|
|
|
|
|
|
|
|
|
|
|
|
for dir in $dirs; do
|
|
|
|
for dir in $dirs; do
|
|
|
|
if test -x "$dir/kdeinit_wrapper"; then
|
|
|
|
if test -x "$dir/tdeinit_wrapper"; then
|
|
|
|
if test -n ""
|
|
|
|
if test -n ""
|
|
|
|
then
|
|
|
|
then
|
|
|
|
evalstr="$dir/kdeinit_wrapper 2>&1 "
|
|
|
|
evalstr="$dir/tdeinit_wrapper 2>&1 "
|
|
|
|
if eval $evalstr; then
|
|
|
|
if eval $evalstr; then
|
|
|
|
kde_cv_path="$dir/kdeinit_wrapper"
|
|
|
|
kde_cv_path="$dir/tdeinit_wrapper"
|
|
|
|
break
|
|
|
|
break
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
else
|
|
|
|
else
|
|
|
|
kde_cv_path="$dir/kdeinit_wrapper"
|
|
|
|
kde_cv_path="$dir/tdeinit_wrapper"
|
|
|
|
break
|
|
|
|
break
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
@ -26611,7 +26611,7 @@ echo "${ECHO_T}$kde_cv_path" >&6
|
|
|
|
|
|
|
|
|
|
|
|
if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then
|
|
|
|
if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then
|
|
|
|
kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
|
|
|
|
kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
|
|
|
|
test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
|
|
|
|
test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs"
|
|
|
|
|
|
|
|
|
|
|
|
KDE_XSL_STYLESHEET=NO
|
|
|
|
KDE_XSL_STYLESHEET=NO
|
|
|
|
for i in $kde_sharedirs;
|
|
|
|
for i in $kde_sharedirs;
|
|
|
|
@ -26648,13 +26648,13 @@ done
|
|
|
|
if test -x "$KDECONFIG"; then # it can be "compiled"
|
|
|
|
if test -x "$KDECONFIG"; then # it can be "compiled"
|
|
|
|
kde_libs_prefix=`$KDECONFIG --prefix`
|
|
|
|
kde_libs_prefix=`$KDECONFIG --prefix`
|
|
|
|
if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
|
|
|
|
if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
|
|
|
|
{ { 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
|
|
|
|
@ -26686,7 +26686,7 @@ echo "$as_me: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
kdeinitdir='$(kde_moduledir)'
|
|
|
|
tdeinitdir='$(kde_moduledir)'
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -26704,64 +26704,64 @@ fi
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if test $kde_qtver = 3; then
|
|
|
|
if test $kde_qtver = 3; then
|
|
|
|
LIB_KDECORE="-lkdecore"
|
|
|
|
LIB_TDECORE="-ltdecore"
|
|
|
|
|
|
|
|
|
|
|
|
LIB_KDEUI="-lkdeui"
|
|
|
|
LIB_TDEUI="-ltdeui"
|
|
|
|
|
|
|
|
|
|
|
|
LIB_KIO="-lkio"
|
|
|
|
LIB_TDEIO="-ltdeio"
|
|
|
|
|
|
|
|
|
|
|
|
LIB_SMB="-lsmb"
|
|
|
|
LIB_SMB="-lsmb"
|
|
|
|
|
|
|
|
|
|
|
|
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"
|
|
|
|
|
|
|
|
|
|
|
|
# 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
|
|
|
|
|
|
|
|
|
|
|
|
@ -27610,20 +27610,20 @@ 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_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_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_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
|
|
|
|
|
Mavridis Philippe
2 months ago