--- configure	2009-09-28 17:29:14.000000000 -0400
+++ configure	2012-05-17 15:32:33.000000000 -0400
@@ -4867,9 +4867,9 @@
   goodsvn="bad";
 elif test $SVN_MAJOR -eq 1 -a $SVN_MINOR -le 3; then
   goodsvn="bad";
-elif test x$SVN_VERSION == x1.4.4; then
+elif test x$SVN_VERSION = x1.4.4; then
   goodsvn="bad";
-elif test x$SVN_VERSION == x1.5.0; then
+elif test x$SVN_VERSION = x1.5.0; then
   goodsvn="bad";
 fi
 
@@ -4878,7 +4878,7 @@
 if test $SVN_MAJOR -ge 1; then
 
   SVN_LIBS_ALL="$SVN_LIBS -lsvn_client-1 -lsvn_wc-1 -lsvn_repos-1"
-  SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_ra-1 -lsvn_ra_svn-1 -lsvn_ra_local-1"
+  SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_ra-1 -lsvn_ra_local-1"
   SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_fs-1 -lsvn_fs_fs-1"
   SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_delta-1 -lsvn_diff-1"
   SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_subr-1"
@@ -4897,7 +4897,7 @@
 
 fi
 
-if test x$goodsvn == xok; then
+if test x$goodsvn = xok; then
   { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
   { echo "$as_me:$LINENO: result:     headers   $SVN_INCLUDES" >&5
@@ -6815,11 +6815,11 @@
 
   QT_BIN="$qt_path/bin"
   QT_PATH="$qt_path"
-  QT_LIBPATH="$qt_path/lib"
+  QT_LIBPATH="$qt_path/lib/qt4"
 
   # extract version numbers of qt
 
-  QT_VERSION=`$QT_BIN/moc -v 2>&1 | sed "s/.*(Qt \(.*\))/\1/"`
+  QT_VERSION=`$QT_BIN/moc-qt4 -v 2>&1 | sed "s/.*(Qt \(.*\))/\1/"`
   QT_MAJOR=`echo $QT_VERSION | sed "s/\(.*\)[.].*[.].*/\1/"`
   QT_MINOR=`echo $QT_VERSION | sed "s/.*[.]\(.*\)[.].*/\1/"`
 
@@ -6849,7 +6849,7 @@
     *)
       # any other Unix platform directly link with the libs
 
-      QT_INCLUDES="-DQT3_SUPPORT -I$qt_path/include -I$qt_path/include/Qt"
+      QT_INCLUDES="-DQT3_SUPPORT -I$qt_path/include -I$qt_path/include/qt4"
       QT_LIBS="-L$QT_LIBPATH -lQt3Support -lQtGui -lQtNetwork -lQtCore"
     ;;
     esac
@@ -6888,11 +6888,6 @@
      QT_INCLUDES="$QT_INCLUDES -I$x_includes"
    fi
 
-   if test x$x_libraries != x; then
-     QT_LIBS="$QT_LIBS -L$x_libraries $X_PRE_LIBS -lX11 -lXext -lXmu -lXt"
-     QT_LIBS="$QT_LIBS -lXi $X_EXTRA_LIBS"
-   fi
-
    ;;
 esac