--- 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
diff -Nurd amarok-1.4.8/amarok/src/collectionscanner/Makefile.am amarok-1.4.8-new/amarok/src/collectionscanner/Makefile.am
--- amarok-1.4.8/amarok/src/collectionscanner/Makefile.am	2007-12-17 10:53:19.000000000 -0500
+++ amarok-1.4.8-new/amarok/src/collectionscanner/Makefile.am	2010-07-30 11:50:32.000000000 -0400
@@ -21,7 +21,7 @@
     $(top_builddir)/amarok/src/libamarok.la \
     $(LIB_QT) \
     $(LIB_KDECORE) \
-    $(taglib_libs)
+    $(taglib_libs) -lDCOP
 
 amarokcollectionscanner_LDFLAGS = \
     $(all_libraries) \
diff -Nurd amarok-1.4.8/amarok/src/engine/xine/Makefile.am amarok-1.4.8-new/amarok/src/engine/xine/Makefile.am
--- amarok-1.4.8/amarok/src/engine/xine/Makefile.am	2007-12-17 10:53:18.000000000 -0500
+++ amarok-1.4.8-new/amarok/src/engine/xine/Makefile.am	2010-07-30 12:35:28.000000000 -0400
@@ -9,10 +9,9 @@
     $(all_includes)
 
 libamarok_xine_engine_la_LIBADD = \
-    $(top_builddir)/amarok/src/libamarok.la \
-    $(top_builddir)/amarok/src/plugin/libplugin.la \
+    -lamarok \
     -lkdeui -lkdecore \
-    $(XINE_LIBS)
+    $(XINE_LIBS) $(LIB_QT)
 
 libamarok_xine_engine_la_SOURCES = \
     xine-scope.c \
diff -Nurd amarok-1.4.8/amarok/src/loader/Makefile.am amarok-1.4.8-new/amarok/src/loader/Makefile.am
--- amarok-1.4.8/amarok/src/loader/Makefile.am	2007-12-17 10:53:19.000000000 -0500
+++ amarok-1.4.8-new/amarok/src/loader/Makefile.am	2010-07-30 11:49:59.000000000 -0400
@@ -8,7 +8,7 @@
 
 amarok_LDADD = \
         $(LIB_QT) \
-        $(LIB_KDEUI)
+        $(LIB_KDEUI) $(LIB_KDECORE)
 
 amarok_LDFLAGS = $(all_libraries) $(KDE_RPATH)