From 46850422d6f857317455a6f7682bda9af4ba77f8 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 6 Nov 2011 21:46:38 -0600 Subject: Rename additional instances of KDE to TDE --- kinit/configure.in.in | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'kinit/configure.in.in') diff --git a/kinit/configure.in.in b/kinit/configure.in.in index 6330594b6..1d14ee592 100644 --- a/kinit/configure.in.in +++ b/kinit/configure.in.in @@ -1,6 +1,6 @@ -KDEINIT_USE_XFT=1 +TDEINIT_USE_XFT=1 dnl check if Qt is linked against Xft -KDE_CHECK_LIB(qt-mt,XftInit,[],[KDEINIT_USE_XFT=]) +KDE_CHECK_LIB(qt-mt,XftInit,[],[TDEINIT_USE_XFT=]) dnl Xft requires freetype to compile KDE_FIND_PATH(fontconfig-config, FONTCONFIG_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [ KDE_FIND_PATH(pkg-config, PKGCONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [AC_MSG_WARN([Could not find neither pkg-config nor fontconfig-config, check http://www.fontconfig.org/ ]) @@ -12,7 +12,7 @@ if test -n "$PKGCONFIG"; then if test -n "$vers" && test "$vers" -ge 1000000 then FONTCONFIG_CFLAGS="`$PKGCONFIG fontconfig --cflags`" - KDEINIT_FONTCONFIG=1 + TDEINIT_FONTCONFIG=1 fi fi @@ -21,39 +21,39 @@ if test -n "$FONTCONFIG_CONFIG"; then if test -n "$vers" && test "$vers" -ge 1000000 then FONTCONFIG_CFLAGS="`$FONTCONFIG_CONFIG --cflags`" - KDEINIT_FONTCONFIG=1 + TDEINIT_FONTCONFIG=1 fi fi -KDE_FIND_PATH(freetype-config, KDEINIT_FREETYPE_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin]) -if test -n "$KDEINIT_FREETYPE_CONFIG"; then - KDEINIT_XFT_INCLUDES="`$KDEINIT_FREETYPE_CONFIG --cflags` $FONTCONFIG_CFLAGS" +KDE_FIND_PATH(freetype-config, TDEINIT_FREETYPE_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin]) +if test -n "$TDEINIT_FREETYPE_CONFIG"; then + TDEINIT_XFT_INCLUDES="`$TDEINIT_FREETYPE_CONFIG --cflags` $FONTCONFIG_CFLAGS" tdeinit_cppflags=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $KDEINIT_XFT_INCLUDES $FONTCONFIG_CFLAGS" - KDE_CHECK_HEADER(X11/Xft/Xft.h,[],[KDEINIT_USE_XFT=]) + CPPFLAGS="$CPPFLAGS $TDEINIT_XFT_INCLUDES $FONTCONFIG_CFLAGS" + KDE_CHECK_HEADER(X11/Xft/Xft.h,[],[TDEINIT_USE_XFT=]) CPPFLAGS=$tdeinit_cppflags else - KDEINIT_USE_XFT= + TDEINIT_USE_XFT= fi -if test -n "$KDEINIT_USE_XFT"; then - AC_DEFINE(KDEINIT_USE_XFT,1,[Use Xft preinitialization in tdeinit]) +if test -n "$TDEINIT_USE_XFT"; then + AC_DEFINE(TDEINIT_USE_XFT,1,[Use Xft preinitialization in tdeinit]) fi -if test -n "$KDEINIT_FONTCONFIG"; then - AC_DEFINE(KDEINIT_USE_FONTCONFIG,1,[Use FontConfig in tdeinit]) +if test -n "$TDEINIT_FONTCONFIG"; then + AC_DEFINE(TDEINIT_USE_FONTCONFIG,1,[Use FontConfig in tdeinit]) fi -AC_SUBST(KDEINIT_XFT_INCLUDES) +AC_SUBST(TDEINIT_XFT_INCLUDES) AC_MSG_CHECKING(whether to make tdeinit setuid root in order to protect it from bad Linux OOM-killer) tdeinit_setuid= case $target_os in linux*) AC_MSG_RESULT(yes) - KDEINIT_SETUID=1 - AC_DEFINE(KDEINIT_OOM_PROTECT,1,[Enable prevention against poor Linux OOM-killer]) + TDEINIT_SETUID=1 + AC_DEFINE(TDEINIT_OOM_PROTECT,1,[Enable prevention against poor Linux OOM-killer]) ;; *) AC_MSG_RESULT(no) - KDEINIT_SETUID=0 + TDEINIT_SETUID=0 ;; esac -AC_SUBST(KDEINIT_SETUID) +AC_SUBST(TDEINIT_SETUID) -- cgit v1.2.1