From 34c8d5455ed8e8b17df44a3d2e6cf2b41d838f64 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 7 Feb 2012 18:21:12 -0600
Subject: [PATCH] Rename include subdirectory to tde

---
 acinclude.m4              | 6 +++---
 aclocal.m4                | 6 +++---
 configure.in              | 6 +++---
 kalyptus/kalyptus.spec.in | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index ea696da..b6b9f5c 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1664,8 +1664,8 @@ fi
 
 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/kde3/include /opt/kde/include $x_includes $qt_includes"
-test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
+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/tde $KDEDIR $kde_incdirs"
 kde_incdirs="$ac_kde_includes $kde_incdirs"
 AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
 ac_kde_includes="$kde_incdir"
@@ -1896,7 +1896,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  kde_cxxflags_safe="$CXXFLAGS"
 
  LIBS="-lkde-qt-addon $LIBQT $LIBS"
- CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes"
+ CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes"
  LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
 
  AC_TRY_LINK([
diff --git a/aclocal.m4 b/aclocal.m4
index 393e12f..bdd74df 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1676,8 +1676,8 @@ fi
 
 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/kde3/include /opt/kde/include $x_includes $qt_includes"
-test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
+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/tde $KDEDIR $kde_incdirs"
 kde_incdirs="$ac_kde_includes $kde_incdirs"
 AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
 ac_kde_includes="$kde_incdir"
@@ -1908,7 +1908,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  kde_cxxflags_safe="$CXXFLAGS"
 
  LIBS="-lkde-qt-addon $LIBQT $LIBS"
- CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes"
+ CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes"
  LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
 
  AC_TRY_LINK([
diff --git a/configure.in b/configure.in
index 3f35942..849f783 100644
--- a/configure.in
+++ b/configure.in
@@ -109,8 +109,8 @@ dnl /PQT
 
 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/kde3/include /opt/kde/include $x_includes $qt_includes"
-test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
+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/tde $KDEDIR $kde_incdirs"
 kde_incdirs="$ac_kde_includes $kde_incdirs"
 AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
 ac_kde_includes="$kde_incdir"
@@ -247,7 +247,7 @@ AC_CACHE_VAL(kde_have_smoketqt,
  AC_LANG_SAVE
  AC_LANG_CPLUSPLUS
  LIBS="-lsmoketqt"
- CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes"
+ CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes"
  LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
  LD_LIBRARY_PATH="$qt_libraries"
 
diff --git a/kalyptus/kalyptus.spec.in b/kalyptus/kalyptus.spec.in
index 6548131..1c270ec 100644
--- a/kalyptus/kalyptus.spec.in
+++ b/kalyptus/kalyptus.spec.in
@@ -25,7 +25,7 @@ make -f Makefile.cvs
 
 %build
 export TDEDIR=%{prefix} QTDIR=%{qtdir}
-CXXFLAGS="$RPM_OPT_FLAGS -I%{prefix}/include/kde" ./configure \
+CXXFLAGS="$RPM_OPT_FLAGS -I%{prefix}/include/tde" ./configure \
 	--prefix=%{prefix}
 make CXXFLAGS="$RPM_OPT_FLAGS -DNO_DEBUG -DNDEBUG"