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

Rename KDEHOME and KDEDIR

Browse Source
pull/1/head
Timothy Pearson 13 years ago
parent 7aa4ae643e
commit ca8bd23461
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File

22
acinclude.m4
Unescape View File

@ -377,13 +377,13 @@ 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)
@ -524,11 +524,11 @@ AC_DEFUN(KDE_SUBST_PROGRAMS,
[ [
kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/trinity/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/trinity/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
@ -543,7 +543,7 @@ AC_DEFUN(KDE_SUBST_PROGRAMS,
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/trinity/share /opt/kde/share $prefix/share" kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/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=""
@ -1616,7 +1616,7 @@ fi
if test -z "$1"; then if test -z "$1"; then
kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/trinity/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/kde /usr/include /opt/trinity/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/kde $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"
@ -1628,7 +1628,7 @@ So, check this please and use another prefix!])
fi fi
kde_libdirs="/usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/trinity /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/trinity/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}" kde_libdirs="/usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/trinity /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/trinity/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}"
test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${tdelibsuff} $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"
@ -2974,7 +2974,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
@ -4526,8 +4526,8 @@ AC_DEFUN(KDE_CONF_FILES,
AC_DEFUN(KDE_SET_PREFIX, AC_DEFUN(KDE_SET_PREFIX,
[ [
unset CDPATH unset CDPATH
dnl make $KDEDIR the default for the installation dnl make $TDEDIR the default for the installation
AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
if test "x$prefix" = "xNONE"; then if test "x$prefix" = "xNONE"; then
prefix=$ac_default_prefix prefix=$ac_default_prefix

22
aclocal.m4 vendored
Unescape View File

@ -389,13 +389,13 @@ 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)
@ -536,11 +536,11 @@ AC_DEFUN(KDE_SUBST_PROGRAMS,
[ [
kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/trinity/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/trinity/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
@ -555,7 +555,7 @@ AC_DEFUN(KDE_SUBST_PROGRAMS,
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/trinity/share /opt/kde/share $prefix/share" kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/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=""
@ -1628,7 +1628,7 @@ fi
if test -z "$1"; then if test -z "$1"; then
kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/trinity/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/kde /usr/include /opt/trinity/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/kde $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"
@ -1640,7 +1640,7 @@ So, check this please and use another prefix!])
fi fi
kde_libdirs="/usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/trinity /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/trinity/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}" kde_libdirs="/usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/trinity /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/trinity/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}"
test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${tdelibsuff} $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"
@ -2986,7 +2986,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
@ -4538,8 +4538,8 @@ AC_DEFUN(KDE_CONF_FILES,
AC_DEFUN(KDE_SET_PREFIX, AC_DEFUN(KDE_SET_PREFIX,
[ [
unset CDPATH unset CDPATH
dnl make $KDEDIR the default for the installation dnl make $TDEDIR the default for the installation
AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
if test "x$prefix" = "xNONE"; then if test "x$prefix" = "xNONE"; then
prefix=$ac_default_prefix prefix=$ac_default_prefix

Write Preview
Loading…
Cancel
Save