summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAutomated System <[email protected]>2012-02-07 19:59:00 -0600
committerAutomated System <[email protected]>2012-02-07 19:59:00 -0600
commit62cd85dbbc0b962e2243f2d3f772586fdf4f6619 (patch)
tree06ef6084e1810ce75b71167e04908ceb28f92947
parentaf75349957740f8f59dda21431683906af13ea33 (diff)
parent4ffbb26e2467674e1971b469077e96d7dffa11d6 (diff)
downloadktorrent-62cd85dbbc0b962e2243f2d3f772586fdf4f6619.tar.gz
ktorrent-62cd85dbbc0b962e2243f2d3f772586fdf4f6619.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/ktorrent
-rw-r--r--acinclude.m46
1 files changed, 3 insertions, 3 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index fb1eb8b..96a42fa 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1817,8 +1817,8 @@ fi
if test -z "$1"; then
-kde_incdirs="$kde_libs_prefix/include /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="$kde_libs_prefix/include /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"
@@ -2054,7 +2054,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([