*** acinclude.m4.orig	Fri Jul 27 21:38:25 2001
--- acinclude.m4	Thu Aug  2 16:22:56 2001
***************
*** 143,149 ****
        qt_bindirs="$ac_qt_bindir $qt_bindirs"
     fi
  
!    KDE_FIND_PATH(moc, MOC, [$qt_bindirs], [KDE_MOC_ERROR_MESSAGE])
     KDE_FIND_PATH(uic, UIC, [$qt_bindirs], [UIC="" ; KDE_UIC_ERROR_MESSAGE])
     if test -z "$UIC" ; then
       if test -z "$UIC_NOT_NEEDED" ; then
--- 143,149 ----
        qt_bindirs="$ac_qt_bindir $qt_bindirs"
     fi
  
!    KDE_FIND_PATH(moc2, MOC, [$qt_bindirs], [KDE_MOC_ERROR_MESSAGE])
     KDE_FIND_PATH(uic, UIC, [$qt_bindirs], [UIC="" ; KDE_UIC_ERROR_MESSAGE])
     if test -z "$UIC" ; then
       if test -z "$UIC_NOT_NEEDED" ; then
***************
*** 878,891 ****
  
  if test -z "$LIBQT_GLOB"; then
  
!   LIBQT_GLOB="libqt.*"
  
  fi
  
  if test -z "$LIBQT"; then
  
!   LIBQT="-lqt"
!   kde_int_qt="-lqt"
  
  dnl ------------------------------------------------------------------------
  dnl If we got --enable-qt-mt then adjust the Qt library name for the host.
--- 878,891 ----
  
  if test -z "$LIBQT_GLOB"; then
  
!   LIBQT_GLOB="libqt2.*"
  
  fi
  
  if test -z "$LIBQT"; then
  
!   LIBQT="-lqt2"
!   kde_int_qt="-lqt2"
  
  dnl ------------------------------------------------------------------------
  dnl If we got --enable-qt-mt then adjust the Qt library name for the host.
***************
*** 896,904 ****
        case $host in
        *-*-linux-*)
          if test "x$GCC" = "xyes"; then
!           LIBQT="-lqt-mt"
!           kde_int_qt="-lqt-mt"
!           LIBQT_GLOB="libqt-mt.*"
            USING_QT_MT="using -mt"
          fi
        ;;
--- 896,904 ----
        case $host in
        *-*-linux-*)
          if test "x$GCC" = "xyes"; then
!           LIBQT="-lqt2-mt"
!           kde_int_qt="-lqt2-mt"
!           LIBQT_GLOB="libqt2-mt.*"
            USING_QT_MT="using -mt"
          fi
        ;;
