--- configure.orig	Mon Nov 28 13:42:56 2005
+++ configure	Mon Nov 28 13:44:13 2005
@@ -22409,7 +22409,7 @@
 	enable_hal02=yes
 fi
 	  fi
-	  if test x$enable_hal05 == xyes || test x$enable_hal02 == xyes; then
+	  if test x$enable_hal05 = xyes || test x$enable_hal02 = xyes; then
   	    enable_hal=yes
 	  else
 	    enable_hal=no
@@ -22426,7 +22426,7 @@
 _ACEOF
 
 	     use_ipod=yes
-	     if test x$enable_hal05 == xyes; then
+	     if test x$enable_hal05 = xyes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_HAL_0_5 1
@@ -22748,7 +22748,7 @@
 RHYTHMBOX_LIBS="$RHYTHMBOX_LIBS $SOUNDSYSTEM_LIBS"
 
 
-  if test "x$GST_INSPECT" == "x"; then
+  if test "x$GST_INSPECT" = "x"; then
     # Extract the first word of "gst-inspect-0.8", so it can be a program name with args.
 set dummy gst-inspect-0.8; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -23002,7 +23002,7 @@
 	have_avahi_05=yes
 fi
 fi
-if test x$have_avahi_06 == xyes || test x$have_avahi_05 == xyes; then
+if test x$have_avahi_06 = xyes || test x$have_avahi_05 = xyes; then
    have_avahi=yes
 else
    have_avahi=no
@@ -23089,7 +23089,7 @@
 
       { echo "$as_me:$LINENO: Detected Avahi, using it for mDNS/DNS-SD" >&5
 echo "$as_me: Detected Avahi, using it for mDNS/DNS-SD" >&6;}
-      if test x$have_avahi_06 == xyes; then
+      if test x$have_avahi_06 = xyes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_AVAHI_0_6 1
@@ -23156,7 +23156,7 @@
    { echo "$as_me:$LINENO: Using Avahi for mDNS/DNS-SD" >&5
 echo "$as_me: Using Avahi for mDNS/DNS-SD" >&6;}
 
-   if test x$have_avahi_06 == xyes; then
+   if test x$have_avahi_06 = xyes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_AVAHI_0_6 1
@@ -23811,7 +23811,7 @@
 
 
 if test x"$x_includes" != x"NONE" && test -n "$x_includes" ; then
-	CFLAGS=$CFLAGS -I`echo $x_includes | sed -e "s/:/ -I/g"`
+	CFLAGS=$CFLAGS\ -I`echo $x_includes | sed -e "s/:/ -I/g"`
 fi
 if test x"$x_libraries" != x"NONE" && test -n "$x_libraries" ; then
 	LIBS=-L`echo $x_libraries | sed -e "s/:/ -L/g"`