Merge from V5_1_3_BR branch (07/12/09)

diff --git a/config_files/check_qt.m4 b/config_files/check_qt.m4
index d98fff260536b1ecdb23b1cfd7e455b0731ff292..0f28aef7d9255db367155e1b234aecd3db2e682c 100644 (file)
--- a/config_files/check_qt.m4
+++ b/config_files/check_qt.m4
@@ -51,6 +51,8 @@ fi
 
 qt_ok=yes
 
+QTDIR=$(echo $QTDIR | sed 's%[/]\+$%%')
+
 AC_LANG_SAVE
 AC_LANG_CPLUSPLUS