diff --git a/acinclude.m4 b/acinclude.m4 index 00f1191..9a6e5f0 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1738,8 +1738,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/trinity/include /opt/kde/include $x_includes $qt_includes" -test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/kde $TDEDIR $kde_incdirs" +kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/trinity/include /opt/kde/include $x_includes $qt_includes" +test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs" kde_incdirs="$ac_kde_includes $kde_incdirs" AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir) ac_kde_includes="$kde_incdir" @@ -1975,7 +1975,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 253cc9b..ceb9e60 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1750,8 +1750,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/trinity/include /opt/kde/include $x_includes $qt_includes" -test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/kde $TDEDIR $kde_incdirs" +kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/trinity/include /opt/kde/include $x_includes $qt_includes" +test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs" kde_incdirs="$ac_kde_includes $kde_incdirs" AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir) ac_kde_includes="$kde_incdir" @@ -1987,7 +1987,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/ksystemlog/doc/Makefile b/ksystemlog/doc/Makefile index d708628..f033215 100644 --- a/ksystemlog/doc/Makefile +++ b/ksystemlog/doc/Makefile @@ -88,7 +88,7 @@ KCFG_DEPENDENCIES = $(KCONFIG_COMPILER) KCONFIG_COMPILER = /usr/bin/kconfig_compiler KDECONFIG = /usr/bin/kde-config KDE_EXTRA_RPATH = -KDE_INCLUDES = -I/usr/include/kde +KDE_INCLUDES = -I/usr/include/tde KDE_LDFLAGS = -L/usr/lib KDE_MT_LDFLAGS = KDE_MT_LIBS = -lpthread @@ -187,7 +187,7 @@ ac_ct_CXX = g++ ac_ct_F77 = ac_ct_RANLIB = ranlib ac_ct_STRIP = strip -all_includes = -I/usr/include/kde -I/usr/share/qt3/include -I. +all_includes = -I/usr/include/tde -I/usr/share/qt3/include -I. all_libraries = -L/usr/lib -L/usr/share/qt3/lib am__fastdepCC_FALSE = # am__fastdepCC_TRUE = @@ -220,7 +220,7 @@ kde_confdir = ${datadir}/config kde_datadir = ${datadir}/apps kde_htmldir = ${datadir}/doc/HTML kde_icondir = ${datadir}/icons -kde_includes = /usr/include/kde +kde_includes = /usr/include/tde kde_kcfgdir = ${datadir}/config.kcfg kde_libraries = /usr/lib kde_libs_htmldir = /usr/share/doc/kde/HTML diff --git a/ksystemlog/doc/en/Makefile b/ksystemlog/doc/en/Makefile index 7472674..a4bd8e6 100644 --- a/ksystemlog/doc/en/Makefile +++ b/ksystemlog/doc/en/Makefile @@ -85,7 +85,7 @@ KCFG_DEPENDENCIES = $(KCONFIG_COMPILER) KCONFIG_COMPILER = /usr/bin/kconfig_compiler KDECONFIG = /usr/bin/kde-config KDE_EXTRA_RPATH = -KDE_INCLUDES = -I/usr/include/kde +KDE_INCLUDES = -I/usr/include/tde KDE_LDFLAGS = -L/usr/lib KDE_MT_LDFLAGS = KDE_MT_LIBS = -lpthread @@ -184,7 +184,7 @@ ac_ct_CXX = g++ ac_ct_F77 = ac_ct_RANLIB = ranlib ac_ct_STRIP = strip -all_includes = -I/usr/include/kde -I/usr/share/qt3/include -I. +all_includes = -I/usr/include/tde -I/usr/share/qt3/include -I. all_libraries = -L/usr/lib -L/usr/share/qt3/lib am__fastdepCC_FALSE = # am__fastdepCC_TRUE = @@ -217,7 +217,7 @@ kde_confdir = ${datadir}/config kde_datadir = ${datadir}/apps kde_htmldir = ${datadir}/doc/HTML kde_icondir = ${datadir}/icons -kde_includes = /usr/include/kde +kde_includes = /usr/include/tde kde_kcfgdir = ${datadir}/config.kcfg kde_libraries = /usr/lib kde_libs_htmldir = /usr/share/doc/kde/HTML diff --git a/ksystemlog/po/Makefile b/ksystemlog/po/Makefile index 08d1077..12fa3d0 100644 --- a/ksystemlog/po/Makefile +++ b/ksystemlog/po/Makefile @@ -85,7 +85,7 @@ KCFG_DEPENDENCIES = $(KCONFIG_COMPILER) KCONFIG_COMPILER = /usr/bin/kconfig_compiler KDECONFIG = /usr/bin/kde-config KDE_EXTRA_RPATH = -KDE_INCLUDES = -I/usr/include/kde +KDE_INCLUDES = -I/usr/include/tde KDE_LDFLAGS = -L/usr/lib KDE_MT_LDFLAGS = KDE_MT_LIBS = -lpthread @@ -184,7 +184,7 @@ ac_ct_CXX = g++ ac_ct_F77 = ac_ct_RANLIB = ranlib ac_ct_STRIP = strip -all_includes = -I/usr/include/kde -I/usr/share/qt3/include -I. +all_includes = -I/usr/include/tde -I/usr/share/qt3/include -I. all_libraries = -L/usr/lib -L/usr/share/qt3/lib am__fastdepCC_FALSE = # am__fastdepCC_TRUE = @@ -217,7 +217,7 @@ kde_confdir = ${datadir}/config kde_datadir = ${datadir}/apps kde_htmldir = ${datadir}/doc/HTML kde_icondir = ${datadir}/icons -kde_includes = /usr/include/kde +kde_includes = /usr/include/tde kde_kcfgdir = ${datadir}/config.kcfg kde_libraries = /usr/lib kde_libs_htmldir = /usr/share/doc/kde/HTML