--- amarok-1.4.1-beta1/amarok/configure.in.bot 2006-06-18 16:56:09.000000000 -0400 +++ amarok-1.4.1-beta1-new/amarok/configure.in.bot 2006-06-18 22:25:17.000000000 -0400 @@ -135,17 +135,6 @@ echo " =" fi -if test x$no_engine = xyes; then - all_tests=bad - echo " ==================================" - echo " === AMAROK WILL NOT BE BUILT ================================================" - echo " ==================================" - echo " =" - echo " = No suitable multimedia framework was detected. You need to install at least" - echo " = the Xine or Helix framework as detailed in the Amarok README." - echo " =" -fi - if test x$no_amarok = xyes; then all_tests=bad echo " ==================================" --- amarok-1.4.1-beta1/amarok/configure.in.in 2006-06-18 16:56:09.000000000 -0400 +++ amarok-1.4.1-beta1-new/amarok/configure.in.in 2006-06-18 22:22:38.000000000 -0400 @@ -960,18 +960,3 @@ -############################################################################### -# BEGIN DO_NOT_COMPILE CHECK -############################################################################### - -if test x$build_xine = xno -a x$build_helix = xno; then - - DO_NOT_COMPILE="$DO_NOT_COMPILE amarok" - no_engine=yes - -fi - -############################################################################### -# END DO_NOT_COMPILE CHECK -############################################################################### - --- amarok-1.4.1-beta1/amarok/src/Makefile.am 2006-06-18 16:56:09.000000000 -0400 +++ amarok-1.4.1-beta1-new/amarok/src/Makefile.am 2006-06-18 22:22:38.000000000 -0400 @@ -155,7 +155,7 @@ libamarok_la_LDFLAGS = \ $(all_libraries) \ - $(KDE_RPATH) + $(KDE_RPATH) -Wl,-framework,CoreFoundation METASOURCES = \ AUTO --- amarok-1.4.1-beta1/amarok/src/engine/xine/Makefile.am 2006-06-18 16:56:09.000000000 -0400 +++ amarok-1.4.1-beta1-new/amarok/src/engine/xine/Makefile.am 2006-06-18 22:23:59.000000000 -0400 @@ -9,8 +9,7 @@ $(all_includes) libamarok_xine_engine_la_LIBADD = \ - $(top_builddir)/amarok/src/libamarok.la \ - $(top_builddir)/amarok/src/plugin/libplugin.la \ + -lamarok \ -lkdeui -lkdecore \ $(LIBS_XINE)