Rename kde-config to tde-config

pull/1/head
Timothy Pearson 13 years ago
parent 55a4f9f1fb
commit 469e5dd472

@ -4981,13 +4981,13 @@ AC_DEFUN([KDE_SET_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
@ -5003,7 +5003,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

10
aclocal.m4 vendored

@ -4993,13 +4993,13 @@ AC_DEFUN([KDE_SET_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
@ -5015,7 +5015,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

@ -459,7 +459,7 @@ 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,"

@ -96,7 +96,7 @@ INSTALL_SCRIPT = ${INSTALL}
INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
KCFG_DEPENDENCIES = $(KCONFIG_COMPILER) KCFG_DEPENDENCIES = $(KCONFIG_COMPILER)
KCONFIG_COMPILER = /usr/bin/kconfig_compiler KCONFIG_COMPILER = /usr/bin/kconfig_compiler
KDECONFIG = /usr/bin/kde-config KDECONFIG = /usr/bin/tde-config
KDE_CHECK_PLUGIN = $(KDE_PLUGIN) -rpath $(libdir) KDE_CHECK_PLUGIN = $(KDE_PLUGIN) -rpath $(libdir)
KDE_EXTRA_RPATH = KDE_EXTRA_RPATH =
KDE_HAS_DOXYGEN = no KDE_HAS_DOXYGEN = no

Loading…
Cancel
Save