--- a/acinclude.m4	Sun Jan 22 20:48:02 2006 +0000
+++ b/acinclude.m4	Sun May 28 12:54:04 2006 +0000
@@ -130,7 +130,7 @@
         # Run test compilation with either standard search path
         # or user-defined paths.
         MY_TRY_LIBSIDPLAY1
-        if test "$xs_sidplay1_works" = yes; then
+        if test "x$xs_sidplay1_works" = "xyes"; then
           xs_cv_have_sidplay1="xs_have_sidplay1=yes  \
             xs_sidplay1_cxxflags=\"$xs_sidplay1_cxxflags\"  \
             xs_sidplay1_ldflags=\"$xs_sidplay1_ldflags\"  "
@@ -141,7 +141,7 @@
 
     eval "$xs_cv_have_sidplay1"
 
-    if test "$xs_have_sidplay1" = yes; then
+    if test "x$xs_have_sidplay1" = "xyes"; then
         if test -n "$xs_sidplay1_cxxflags" || test -n "$xs_sidplay1_ldflags"; then
             AC_MSG_RESULT([$xs_sidplay1_cxxflags $xs_sidplay1_ldflags])
         else
@@ -227,7 +227,7 @@
     # Derive sidbuilders path from libsidplay2 root.
     if test -n "$xs_sidplay2_library"; then
         xs_sidplay2_builders="$xs_sidplay2_library/sidplay/builders"
-    elif test "$xs_pkgcfg_knows" = yes ; then
+    elif test "x$xs_pkgcfg_knows" = "xyes" ; then
         xs_sidplay2_builders=`$PKG_CONFIG --variable=builders libsidplay2`
     fi
 
@@ -237,7 +237,7 @@
         # or user-defined paths.
         xs_sidplay2_ldadd="-lsidplay2"
         MY_TRY_LIBSIDPLAY2
-        if test "$xs_sidplay2_works" = yes; then
+        if test "x$xs_sidplay2_works" = "xyes"; then
           xs_cv_have_sidplay2="xs_have_sidplay2=yes  \
             xs_sidplay2_cxxflags=\"$xs_sidplay2_cxxflags\"  \
             xs_sidplay2_ldadd=\"$xs_sidplay2_ldadd\"  \
@@ -247,7 +247,7 @@
         fi
     ])
     eval "$xs_cv_have_sidplay2"
-    if test "$xs_have_sidplay2" = yes; then
+    if test "x$xs_have_sidplay2" = "xyes"; then
         if test -n "$xs_sidplay2_cxxflags" || test -n "$xs_sidplay2_ldadd"; then
             AC_MSG_RESULT([$xs_sidplay2_cxxflags $xs_sidplay2_ldadd])
         else
@@ -271,7 +271,7 @@
 [
     # See whether user didn't provide paths.
     if test -z "$xs_sidplay2_includes"; then
-        if test "$xs_pkgcfg_knows" = yes ; then
+        if test "x$xs_pkgcfg_knows" = "xyes" ; then
             xs_sidplay2_includes=`$PKG_CONFIG --variable=includedir libsidplay2`
             xs_sidplay2_cxxflags=`$PKG_CONFIG --cflags libsidplay2`
         else
@@ -284,7 +284,7 @@
         xs_sidplay2_cxxflags="-I$xs_sidplay2_includes"
     fi
     if test -z "$xs_sidplay2_library"; then
-        if test "$xs_pkgcfg_knows" = yes ; then
+        if test "x$xs_pkgcfg_knows" = "xyes" ; then
             xs_sidplay2_library=`$PKG_CONFIG --variable=libdir libsidplay2`
             xs_sidplay2_ldadd=`$PKG_CONFIG --libs libsidplay2`
             xs_sidplay2_builders=`$PKG_CONFIG --variable=builders libsidplay2`
@@ -386,7 +386,7 @@
         BUILDERS_LDFLAGS="-L$builders_libdir"
     fi
 
-    if test -d $builders_libdir; then
+    if test -d "$builders_libdir"; then
         xs_have_sidbuilders_dir=yes
         AC_MSG_RESULT([$builders_libdir])
     else
@@ -430,7 +430,7 @@
 
     MY_TRY_LINK_RESTORE
 
-    if test "$builders_work" = yes; then
+    if test "x$builders_work" = "xyes"; then
         builders_available=yes
         xs_builders="reSID $xs_builders"
         AC_DEFINE(HAVE_RESID_BUILDER)
@@ -466,7 +466,7 @@
 
     MY_TRY_LINK_RESTORE
 
-    if test "$builders_work" = yes; then
+    if test "x$builders_work" = "xyes"; then
         builders_available=yes
         xs_builders="HardSID $xs_builders"
         AC_DEFINE(HAVE_HARDSID_BUILDER)