--- ecasound-1.7.9r13/configure.orig Fri Jun 23 15:17:34 2000 +++ ecasound-1.7.9r13/configure Wed Aug 30 08:43:53 2000 @@ -3064,7 +3064,7 @@ else #try to guess qt locations -qt_incdirs="$ac_qt_includes /usr/lib/qt/include /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt $x_includes $QTINC" +qt_incdirs="/usr/include/qt2" test -n "$QTDIR" && qt_incdirs="$QTDIR/include $QTDIR $qt_incdirs" qt_incdir=NO @@ -3081,7 +3081,7 @@ ac_qt_includes=$qt_incdir -qt_libdirs="$ac_qt_libraries /usr/lib/qt/lib /usr/local/qt/lib /usr/lib/qt /usr/X11R6/lib /usr/lib $x_libraries $QTLIB" +qt_libdirs="/usr/lib" test -n "$QTDIR" && qt_libdirs="$QTDIR/lib $QTDIR $qt_libdirs" qt_libdir=NO --- ecasound-1.7.9r13/qtecasound/Makefile.in.orig Wed Aug 30 08:51:24 2000 +++ ecasound-1.7.9r13/qtecasound/Makefile.in Wed Aug 30 08:51:54 2000 @@ -104,11 +104,11 @@ @COMPILE_QTECASOUND_TRUE@qtecasound_SOURCES = $(ecasound_qt_src) $(ecasound_qt_mocs) $(ecasound_qt_includes) @COMPILE_QTECASOUND_TRUE@qtecasound_debug_SOURCES = $(ecasound_qt_src) $(ecasound_qt_mocs) $(ecasound_qt_includes) #qtecasound_LDFLAGS = -s -lstdc++ -@COMPILE_QTECASOUND_TRUE@qtecasound_LDADD = -L$(top_builddir)/kvutils -L$(top_builddir)/kvutils/.libs -lkvutils -L$(qt_libraries) -lqt $(top_builddir)/libecasound/src/libecasound.la $(top_builddir)/libqtecasound/libqtecasound.la -@COMPILE_QTECASOUND_TRUE@qtecasound_debug_LDADD = -L$(top_builddir)/kvutils -L$(top_builddir)/kvutils/.libs -lkvutils -L$(qt_libraries) -lqt $(top_builddir)/libecasound/src/libecasound_debug.la $(top_builddir)/libqtecasound/libqtecasound_debug.la +@COMPILE_QTECASOUND_TRUE@qtecasound_LDADD = -L$(top_builddir)/kvutils -L$(top_builddir)/kvutils/.libs -lkvutils -L$(qt_libraries) -lqt2 $(top_builddir)/libecasound/src/libecasound.la $(top_builddir)/libqtecasound/libqtecasound.la +@COMPILE_QTECASOUND_TRUE@qtecasound_debug_LDADD = -L$(top_builddir)/kvutils -L$(top_builddir)/kvutils/.libs -lkvutils -L$(qt_libraries) -lqt2 $(top_builddir)/libecasound/src/libecasound_debug.la $(top_builddir)/libqtecasound/libqtecasound_debug.la @COMPILE_QTECASOUND_TRUE@qtecasound_LDFLAGS = $(all_libraries) @COMPILE_QTECASOUND_TRUE@qtecasound_debug_LDFLAGS = $(qtecasound_LDFLAGS) -#qtecasound_LDADD = -lm -lpthread -lqt $(top_srcdir)/libecasound/src/libecasound.la +#qtecasound_LDADD = -lm -lpthread -lqt2 $(top_srcdir)/libecasound/src/libecasound.la #qtecasound_METASOURCES = USE_AUTOMOC # qt-moc: --- ecasound-1.7.9r13/Documentation/Makefile.in.orig Wed Aug 30 08:57:23 2000 +++ ecasound-1.7.9r13/Documentation/Makefile.in Wed Aug 30 08:57:45 2000 @@ -373,7 +373,7 @@ kdoc -f html -u "http://localhost/ecasound/Documentation/libqtecasound/" \ -d ../Documentation/libqtecasound/ -n libqtecasound \ -L ../Documentation/ *.h \ - -llibecasound -llibkvutils -lqt + -llibecasound -llibkvutils -lqt2 cd @top_srcdir@/ecasound ; \ kdoc -f html -u \ "http://localhost/ecasound/Documentation/ecasound/" \ @@ -383,7 +383,7 @@ kdoc -f html -u \ "http://localhost/ecasound/Documentation/qtecasound/" \ -d ../Documentation/qtecasound/ \ - -L ../Documentation/ *.h -llibecasound -lqt -llibkvutils + -L ../Documentation/ *.h -llibecasound -lqt2 -llibkvutils cd @top_srcdir@/Documentation/qtecasound ; \ qt2kdoc -u "http://www.troll.no/qt/" -o . /usr/doc/qt/ cd @top_srcdir@/ecatools ; \