--- configure.in.orig	Wed Nov 22 16:55:07 2000
+++ configure.in	Fri Feb  2 22:45:34 2001
@@ -48,15 +48,15 @@
 if test "$enableval" = "yes"; then \
   DEBUG="-g -DDEBUG -W -Wall"; \
 else
-  DEBUG="-O2 -DNO_DEBUG -DNO_CHECK"; \
+  DEBUG="$CXXFLAGS -DNO_DEBUG -DNO_CHECK"; \
 fi,
 enableval=no
-DEBUG="-O2 -DNO_DEBUG -DNO_CHECK")
+DEBUG="$CXXFLAGS -DNO_DEBUG -DNO_CHECK")
 AC_MSG_RESULT($enableval)
 AC_SUBST(DEBUG)
 
 AC_MSG_CHECKING(for Qt >= 2.2.0)
-if ! test -r $QTDIR/include/qaction.h; then
+if ! test -r $QTDIR/include/qt2/qaction.h; then
   AC_MSG_ERROR([  Sorry, but you need Qt version 2.2.0 or higher to compile $PACKAGE])
  else
   AC_MSG_RESULT(yes)
@@ -64,12 +64,12 @@
 
 AC_PATH_X
 qtdir=${QTDIR}
-qt_includes=$qtdir/include
+qt_includes=$qtdir/include/qt2
 qt_libraries=$qtdir/lib
 qt_moc=$qtdir/bin
 QT_LDFLAGS=-L$qt_libraries
 LDFLAGS="$LDFLAGS -L$qt_libraries"
-AC_CHECK_LIB(qt, main,,AC_MSG_ERROR(Cannot find required library Qt.))
+AC_CHECK_LIB(qt2, main,,AC_MSG_ERROR(Cannot find required library Qt.))
 AC_SUBST(qt_includes)
 AC_SUBST(qt_libraries)
 AC_SUBST(QT_LDFLAGS)
@@ -78,12 +78,6 @@
 dnl !!!!! fix it !!!!!
 all_includes=-I$qt_includes
 AC_SUBST(all_includes)
-
-dnl @iko : inject msg2qm real path, as if it may be installed in other catalog ^)
-AC_PATH_PROG(MSG2QM,msg2qm,,$bindir:$QTDIR/bin)
-if test "$MSG2QM" = ""; then
- AC_MSG_ERROR([  Sorry, but you need msg2qm (Qt2 program) to compile $PACKAGE])
-fi
 
 dnl *** check QTEZ environment variable ***
 AC_MSG_CHECKING(for QTEZ variable)
