diff --git a/legacy/emotion/configure.in b/legacy/emotion/configure.in
index f6b31d4437..618c96c7f2 100644
--- a/legacy/emotion/configure.in
+++ b/legacy/emotion/configure.in
@@ -178,6 +178,11 @@ if test "$enable_gstreamer" != "no" ; then
            [ffmpeg],
            [HAVE_GSTFFMPEG="yes"],
            [HAVE_GSTFFMPEG="no"])
+
+        AM_GST_ELEMENT_CHECK(
+           [cdiocddasrc],
+           [HAVE_GSTCDIOCDDASRC="yes"],
+           [HAVE_GSTCDIOCDDASRC="no"])
 fi
 if test "$enable_gstreamer$HAVE_GSTREAMER" = "yesno" ; then
 	AC_MSG_RESULT(gstreamer not found)
@@ -187,7 +192,7 @@ if test "$HAVE_GSTPLUG" = "no"; then
 		GSTPLUG_MSG="no"
 	else
 		AC_MSG_WARN([You should install gstreamer plugins and gst-ffmpeg to properly decode your video and audio files])
-		GSTPLUG_MSG="no (you should install gst-plugins and gst-ffmpeg)"
+		GSTPLUG_MSG="no (you should install gst-plugins-base and gst-ffmpeg)"
 	fi
 else
 	if test "$HAVE_GSTFFMPEG" = "no"; then
@@ -195,7 +200,7 @@ else
 			GSTPLUG_MSG="no"
 		else
 			AC_MSG_WARN([You should install gstreamer plugins and gst-ffmpeg to properly decode your video and audio files])
-			GSTPLUG_MSG="no (you should install gst-plugins and gst-ffmpeg)"
+			GSTPLUG_MSG="no (you should install gst-plugins-base and gst-ffmpeg)"
 		fi
 		requirements="$requirements gstreamer"
 		GSTPLUG_MSG="yes"
@@ -203,6 +208,13 @@ else
 		requirements="$requirements gstreamer"
 		GSTPLUG_MSG="yes"
 	fi
+	if test "$HAVE_GSTCDIOCDDASRC" = "no"; then
+		AC_MSG_WARN([You should install gstreamer-plugins-good and make sure that the cdiocddasrc element is installed])
+		GSTCDDA_MSG="no (you should install gst-plugins-good and the cdiocddasrc element)"
+        else
+		requirements="$requirements gstreamer"
+		GSTCDDA_MSG="yes"
+	fi
 fi
 if test "$HAVE_XINE$HAVE_GSTREAMER" = "nono" ; then
    AC_MSG_ERROR([Xine or Gstreamer must be installed to build emotion])
@@ -249,6 +261,7 @@ echo "    Xine...............: $HAVE_XINE"
 echo "    Gstreamer..........: $HAVE_GSTREAMER"
 echo "    Gstreamer plugins..: $GSTPLUG_MSG"
 echo "    Gstreamer FFmpeg...: $HAVE_GSTFFMPEG"
+echo "    Gstreamer CDDA.....: $GSTCDDA_MSG"
 echo
 echo "  Compilation..........: make"
 echo
diff --git a/legacy/emotion/m4/gst-element-check.m4 b/legacy/emotion/m4/gst-element-check.m4
index 8cae8fdac0..e608f195d0 100644
--- a/legacy/emotion/m4/gst-element-check.m4
+++ b/legacy/emotion/m4/gst-element-check.m4
@@ -1,9 +1,6 @@
 dnl Perform a check for a GStreamer element using gst-inspect
 dnl Thomas Vander Stichele <thomas at apestaart dot org>
 dnl Last modification: 25/01/2005
-dnl
-dnl Modified by Vincent Torri <vtorri at univ-evry dot fr>
-dnl Last modification: 19/10/2005
 
 dnl AM_GST_ELEMENT_CHECK(ELEMENT-NAME, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
 
@@ -14,24 +11,13 @@ AC_DEFUN([AM_GST_ELEMENT_CHECK],
   fi
 
   if test "x$GST_INSPECT" != "x"; then
-    AC_MSG_CHECKING(GStreamer element $1 with $GST_INSPECT)
+    AC_MSG_CHECKING(GStreamer element $1)
     if [ $GST_INSPECT $1 > /dev/null 2> /dev/null ]; then
       AC_MSG_RESULT(found.)
       $2
     else
       AC_MSG_RESULT(not found.)
-      AC_CHECK_PROG(GST_INSPECT_0_8, gst-inspect-0.8, gst-inspect-0.8, [])
-
-      if test "x$GST_INSPECT_0_8" != "x"; then
-        AC_MSG_CHECKING(GStreamer element $1 with $GST_INSPECT_0_8)
-        if [ $GST_INSPECT_0_8 $1 > /dev/null 2> /dev/null ]; then
-          AC_MSG_RESULT(found.)
-          $2
-        else
-          AC_MSG_RESULT(not found.)
-          $3
-        fi
-      fi
+      $3
     fi
   fi
 ])