--- configure.orig	Thu Feb  2 02:03:39 2006
+++ configure	Thu Feb  2 02:04:34 2006
@@ -21318,9 +21318,9 @@
 	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
-      if test x$enable_hal05 == xyes; then
+      if test x$enable_hal05 = xyes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_HAL_0_5 1
@@ -22121,7 +22121,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
@@ -22208,7 +22208,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
@@ -22275,7 +22275,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
@@ -23069,7 +23069,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"`