From a5430e4b98efd05937bd3bfe78c56eb826f145fa Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 23:19:22 -0600
Subject: Rename many classes and header files to avoid conflicts with KDE4

---
 kcontrol/tdefontinst/configure.in.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'kcontrol/tdefontinst/configure.in.in')

diff --git a/kcontrol/tdefontinst/configure.in.in b/kcontrol/tdefontinst/configure.in.in
index df6d3d34c..65a5bc3f4 100644
--- a/kcontrol/tdefontinst/configure.in.in
+++ b/kcontrol/tdefontinst/configure.in.in
@@ -119,7 +119,7 @@ if test "$KFI_FOUND_FREETYPE" -eq 1; then
         fi
         AC_SUBST(LIB_FONT_ENC)
 
-        FONTINST_SUBDIR="kfontinst"
+        FONTINST_SUBDIR="tdefontinst"
         # Check for Xft...
         ac_xft_headers=0
         ac_CXXFLAGS_save="$CXXFLAGS"
@@ -140,10 +140,10 @@ if test "$KFI_FOUND_FREETYPE" -eq 1; then
         CFLAGS="$ac_CFLAGS_save"
         CPPFLAGS="$ac_CPPFLAGS_save"
     else
-        AC_MSG_WARN([Missing FontConfig - disabling kfontinst!])
+        AC_MSG_WARN([Missing FontConfig - disabling tdefontinst!])
     fi
 else
-    AC_MSG_WARN([Missing FreeType2 - disabling kfontinst!])
+    AC_MSG_WARN([Missing FreeType2 - disabling tdefontinst!])
 fi
 
 AM_CONDITIONAL(include_fontinst_tn, test "$ac_xft_headers" -eq 1)
@@ -152,4 +152,4 @@ if test "$ac_xft_headers" -eq 1 ; then
     AC_DEFINE(HAVE_XFT, 1, [Defines if you have Xft])
 fi
 
-AM_CONDITIONAL(include_kcontrol_kfontinst, test -n "$FONTINST_SUBDIR")
+AM_CONDITIONAL(include_kcontrol_tdefontinst, test -n "$FONTINST_SUBDIR")
-- 
cgit v1.2.3