Index: configure.in
===================================================================
--- configure.in	(revision 23942)
+++ configure.in	(working copy)
@@ -241,7 +241,7 @@ else
   WINDRES=":"
 fi
 
-AM_CONDITIONAL(MS_LIB_AVAILABLE, test x$ms_librarian = xyes)
+AM_CONDITIONAL(MS_LIB_AVAILABLE, test "x$ms_librarian" = xyes)
 AM_CONDITIONAL(HAVE_WINDRES, test "x$WINDRES" != "x:")
 
 AC_SUBST(WINDRES)
@@ -335,8 +335,8 @@ CFLAGS="$CFLAGS $extra_warnings"
 # compiling for Win32 with gcc.
 # What flag to depends on gcc version: gcc3 uses "-mms-bitfields", while
 # gcc2 uses "-fnative-struct".
-if test x"$os_win32" = xyes; then
-  if test x"$GCC" = xyes; then
+if test "x$os_win32" = xyes; then
+  if test "x$GCC" = xyes; then
     msnative_struct=''
     AC_MSG_CHECKING([how to get MSVC-compatible struct packing])
     if test -z "$ac_cv_prog_CC"; then
@@ -356,7 +356,7 @@ if test x"$os_win32" = xyes; then
 	fi
 	;;
     esac
-    if test x"$msnative_struct" = x ; then
+    if test "x$msnative_struct" = x ; then
       AC_MSG_RESULT([no way])
       AC_MSG_WARN([build will be incompatible with GTK+ DLLs])
     else
@@ -456,7 +456,7 @@ AC_MSG_RESULT($have_gtk_2_13)
 PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0 >= gdk_pixbuf_required_version)
 
 AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no)
-if test x$GDK_PIXBUF_CSOURCE = xno; then
+if test "x$GDK_PIXBUF_CSOURCE" = xno; then
   AC_MSG_ERROR(Could not find gdk-pixbuf-csource in your PATH)
 fi
 
@@ -851,7 +851,7 @@ int main()
     AC_MSG_RESULT(yes),
     AC_MSG_RESULT(no),
     AC_MSG_RESULT(assuming no))
-AM_CONDITIONAL(HAVE_GLIBC_REGEX, test x$have_glibc_regex = xyes)
+AM_CONDITIONAL(HAVE_GLIBC_REGEX, test "x$have_glibc_regex" = xyes)
 
 AC_SUBST(HAVE_GLIBC_REGEX)
 
@@ -860,19 +860,19 @@ AC_SUBST(HAVE_GLIBC_REGEX)
 # Check for select and fdset
 ############################
 
-if test x"$os_win32" != xyes; then
+if test "x$os_win32" != xyes; then
   AC_MSG_CHECKING([fd_set and sys/select])
   AC_TRY_COMPILE([#include <sys/types.h>],
 	  [fd_set readMask, writeMask;], gimp_ok=yes, gimp_ok=no)
-  if test $gimp_ok = no; then
+  if test "x$gimp_ok" = xno; then
       AC_EGREP_HEADER(fd_mask, sys/select.h, gimp_ok=yes)
-      if test $gimp_ok = yes; then
+      if test "x$gimp_ok" = xyes; then
 	  AC_DEFINE(HAVE_SYS_SELECT_H, 1,
 		    [Define to 1 if you have the <sys/select.h> header.])
       fi
   fi
   AC_MSG_RESULT($gimp_ok)
-  if test $gimp_ok = no; then
+  if test "x$gimp_ok" = xno; then
       AC_DEFINE(NO_FD_SET, 1,
 		[Define to 1 if you don't have the fd_set typedef.])
   fi
@@ -971,7 +971,7 @@ AM_CONDITIONAL(TOOLBOX_MENU, test "x$ena
 
 have_libtiff=no
 AC_ARG_WITH(libtiff,  [  --without-libtiff       build without TIFF support])
-  if test x$with_libtiff != xno && test -z "$LIBTIFF"; then
+  if test "x$with_libtiff" != xno && test -z "$LIBTIFF"; then
     have_libtiff=yes
     AC_CHECK_LIB(tiff, TIFFReadScanline,
       [AC_CHECK_HEADER(tiffio.h,
@@ -988,7 +988,7 @@ AC_ARG_WITH(libtiff,  [  --without-libti
         [have_libtiff="no (TIFF library not found)"], -ljpeg -lz -lm)], -ljpeg -lz -lm)], -lm)
   fi
 
-  if test x$with_libtiff != xno && test -z "$LIBTIFF"; then
+  if test "x$with_libtiff" != xno && test -z "$LIBTIFF"; then
      AC_MSG_ERROR([
 *** Checks for TIFF libary failed. You can build without it by passing
 *** --without-libtiff to configure but you won't be able to use TIFFs then.])
@@ -1004,7 +1004,7 @@ AC_SUBST(LIBTIFF)
 ###################
 
 AC_ARG_WITH(libjpeg,  [  --without-libjpeg       build without JPEG support])
-  if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then
+  if test "x$with_libjpeg" != xno && test -z "$LIBJPEG"; then
     AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
       jpeg_ok=yes,
       [jpeg_ok="no (JPEG library not found)"
@@ -1031,7 +1031,7 @@ AC_ARG_WITH(libjpeg,  [  --without-libjp
     fi
   fi
 
-  if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then
+  if test "x$with_libjpeg" != xno && test -z "$LIBJPEG"; then
      AC_MSG_ERROR([
 *** Checks for JPEG library failed. You can build without it by passing
 *** --without-libjpeg to configure but you won't be able to use JPEGs then.])
@@ -1042,10 +1042,10 @@ AC_SUBST(LIBJPEG)
 
 ## xjt does build, but it is more confusing than useful on Win32,
 ## as it wants to run tar, mv and bzip2, which seldom are available
-AM_CONDITIONAL(BUILD_XJT, test x$jpeg_ok = xyes && test x"$os_win32" = xno)
-if test x$jpeg_ok != xyes; then
+AM_CONDITIONAL(BUILD_XJT, test "x$jpeg_ok" = xyes && test "x$os_win32" = xno)
+if test "x$jpeg_ok" != xyes; then
   have_xjt="no (no JPEG library)"
-elif test x"$os_win32" = xyes; then
+elif test "x$os_win32" = xyes; then
   have_xjt="no (not built on Windows)"
 else
   have_xjt=yes
@@ -1075,7 +1075,7 @@ AC_SUBST(PSP)
 
 have_libpng=no
 AC_ARG_WITH(libpng,  [  --without-libpng        build without PNG support])
-if test x$with_libpng != xno; then
+if test "x$with_libpng" != xno; then
   have_libpng=yes
   PKG_CHECK_MODULES(PNG, libpng,
     PNG='png$(EXEEXT)'
@@ -1089,7 +1089,7 @@ fi
 AC_SUBST(PNG)
 AC_SUBST(LIBPNG)
 
-AM_CONDITIONAL(HAVE_PNG, test x$have_libpng = xyes)
+AM_CONDITIONAL(HAVE_PNG, test "x$have_libpng" = xyes)
 
 
 ##################
@@ -1099,7 +1099,7 @@ AM_CONDITIONAL(HAVE_PNG, test x$have_lib
 have_libmng=no
 AC_ARG_WITH(libmng,  [  --without-libmng        build without MNG support])
   have_libmng=yes
-  if test x$with_libmng != xno && test -z "$LIBMNG" &&
+  if test "x$with_libmng" != xno && test -z "$LIBMNG" &&
      test -n "$LIBPNG" && test -n "$LIBJPEG" && test -n "$LIBZ"; then
     AC_CHECK_LIB(mng, mng_create,
       [AC_CHECK_HEADER(libmng.h, mng_ok=yes)],
@@ -1123,7 +1123,7 @@ AC_SUBST(LIBMNG)
 
 have_libexif=no
 AC_ARG_WITH(libexif,  [  --without-libexif       build without EXIF support])
-if test x$with_libexif != xno && test -z "$LIBEXIF" && test -n "$LIBJPEG"; then
+if test "x$with_libexif" != xno && test -z "$LIBEXIF" && test -n "$LIBJPEG"; then
   have_libexif=yes
   PKG_CHECK_MODULES(EXIF, libexif >= exif_required_version,
     AC_DEFINE(HAVE_EXIF, 1, [Define to 1 if libexif is available]),
@@ -1142,7 +1142,7 @@ AC_SUBST(EXIF_LIBS)
 
 have_libaa=no
 AC_ARG_WITH(aa,  [  --without-aa            do not build the AA plug-in])
-if test x$with_aa != xno && test -z "$LIBAA"; then
+if test "x$with_aa" != xno && test -z "$LIBAA"; then
   have_libaa=yes
   AC_CHECK_LIB(aa, aa_printf,
     [AC_CHECK_HEADER(aalib.h,
@@ -1272,7 +1272,7 @@ have_gnomeui="no (disabled)"
 have_gnome_keyring="no (disabled)"
 have_gnomevfs="no (disabled)"
 
-if test x$with_gnomevfs != xno; then
+if test "x$with_gnomevfs" != xno; then
 
 if $PKG_CONFIG --atleast-version=gnomeui_required_version libgnomeui-2.0; then
   have_gnomeui=yes
@@ -1295,7 +1295,7 @@ PKG_CHECK_MODULES(URI_GNOME_VFS, $gnome_
 
 fi
 
-AM_CONDITIONAL(HAVE_GNOMEVFS, test x"$have_gnomevfs" = xyes)
+AM_CONDITIONAL(HAVE_GNOMEVFS, test "x$have_gnomevfs" = xyes)
 
 libcurl_modules="libcurl >= libcurl_required_version"
 
@@ -1303,7 +1303,7 @@ AC_ARG_WITH(libcurl,  [  --without-libcu
 
 have_libcurl="no (disabled)"
 
-if test x$with_libcurl != xno; then
+if test "x$with_libcurl" != xno; then
 
 PKG_CHECK_MODULES(URI_LIBCURL, $libcurl_modules,
   have_libcurl=yes,
@@ -1316,9 +1316,9 @@ AM_CONDITIONAL(HAVE_LIBCURL, test "x$hav
 
 if test "x$have_gnomevfs" = xyes; then
   uri_plugin="yes (using gnome-vfs)"
-elif test x"$have_libcurl" = xyes; then
+elif test "x$have_libcurl" = xyes; then
   uri_plugin="yes (using libcurl)"
-elif test x"$os_win32" = xno; then
+elif test "x$os_win32" = xno; then
   uri_plugin="yes (using wget)"
 fi
 
@@ -1376,7 +1376,7 @@ if test "x$with_lcms" != xno; then
           [Define to 1 if the lcms header must be included as lcms/lcms.h]))
       ])
   ])
-  if test $have_lcms = yes; then
+  if test "x$have_lcms" = xyes; then
     AC_DEFINE(HAVE_LCMS, 1, [Define to 1 if lcms is available])
     LIBLCMS="-llcms"
     LCMS='lcms$(EXEEXT)'
@@ -1389,7 +1389,7 @@ fi
 
 AC_SUBST(LCMS)
 AC_SUBST(LIBLCMS)
-AM_CONDITIONAL(HAVE_LCMS, test $have_lcms = yes)
+AM_CONDITIONAL(HAVE_LCMS, test "x$have_lcms" = xyes)
 
 
 ################
@@ -1422,7 +1422,7 @@ if test "x$with_linux_input" != "xno"; t
 		[#include <linux/input.h>]))
 fi
 
-AM_CONDITIONAL(HAVE_LINUX_INPUT, test $have_linux_input = yes)
+AM_CONDITIONAL(HAVE_LINUX_INPUT, test "x$have_linux_input" = xyes)
 
 
 ###############################
@@ -1432,7 +1432,7 @@ AM_CONDITIONAL(HAVE_LINUX_INPUT, test $h
 AC_ARG_WITH(directx-sdk, [  --with-directx-sdk=PFX  prefix where the DirectX SDK is installed(optional)])
 
 have_dx_dinput=no
-if test x"$os_win32" = xyes; then
+if test "x$os_win32" = xyes; then
   case "$with_directx_sdk" in
     *" "*) AC_MSG_WARN([The DirectX SDK should be accessible through a path without spaces. Use MSYS mounts. Ignoring your --with-directx-sdk switch.])
            with_directx_sdk=;;
@@ -1457,7 +1457,7 @@ if test x"$os_win32" = xyes; then
   fi
 fi
 
-AM_CONDITIONAL(HAVE_DX_DINPUT, test $have_dx_dinput = yes)
+AM_CONDITIONAL(HAVE_DX_DINPUT, test "x$have_dx_dinput" = xyes)
 
 
 ###############################
@@ -1468,7 +1468,7 @@ AC_ARG_WITH(dbus,  [  --without-dbus    
 
 have_dbus_glib="no (disabled)"
 
-if test x$with_dbus != xno; then
+if test "x$with_dbus" != xno; then
 
 PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1 >= dbus_glib_required_version,
   have_dbus_glib=yes,
@@ -1479,7 +1479,7 @@ fi
 
 if test "x$have_dbus_glib" = xyes; then
   AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool, no)
-  if test x$DBUS_BINDING_TOOL = xno; then
+  if test "x$DBUS_BINDING_TOOL" = xno; then
     AC_MSG_WARN([Could not find dbus-binding-tool in your PATH])
     have_dbus_glib="no (dbus-binding-tool not found)"
   fi
@@ -1561,7 +1561,7 @@ AC_ARG_WITH(pdbgen,
             [  --with-pdbgen           use 'pdbgen' code generation tool],,
   with_pdbgen=$enable_maintainer_mode)
 
-AM_CONDITIONAL(WITH_PDBGEN, test x$with_pdbgen = xyes)
+AM_CONDITIONAL(WITH_PDBGEN, test "x$with_pdbgen" = xyes)
 
 
 ##################
@@ -1643,7 +1643,7 @@ AM_CONDITIONAL(BUILD_SCRIPT_FU, test "x$
 # Some plug-ins don't build on Win32, others are Win32-only
 ###########################################################
 
-if test x"$os_win32" = xno; then
+if test "x$os_win32" = xno; then
   MAIL='mail$(EXEEXT)'
   SCREENSHOT='screenshot$(EXEEXT)'
 fi
@@ -1663,7 +1663,7 @@ AC_TRY_CPP([
 #include <TWAIN/TWAIN.h>
 ], mac_twain_ok=yes)
 AC_MSG_RESULT($mac_twain_ok)
-AM_CONDITIONAL(HAVE_MAC_TWAIN, test x$mac_twain_ok = xyes)
+AM_CONDITIONAL(HAVE_MAC_TWAIN, test "x$mac_twain_ok" = xyes)
 
 
 #############################################################
@@ -1720,10 +1720,10 @@ GTK_DOC_CHECK([1.0])
 
 dnl NOTE: We need to use a separate automake conditional for this
 dnl       to make this work with the tarballs.
-AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
+AM_CONDITIONAL(ENABLE_GTK_DOC, test "x$enable_gtk_doc" = xyes)
 
 AC_ARG_ENABLE(gtk-doc-app, [  --enable-gtk-doc-app    build developer documentation for app (default=no)], , enable_gtk_doc_app=no)
-AM_CONDITIONAL(ENABLE_GTK_DOC_APP, test x$enable_gtk_doc_app = xyes)
+AM_CONDITIONAL(ENABLE_GTK_DOC_APP, test "x$enable_gtk_doc_app" = xyes)
 
 
 #########################################
@@ -1732,12 +1732,12 @@ AM_CONDITIONAL(ENABLE_GTK_DOC_APP, test 
 
 AC_ARG_ENABLE(default-binary, [  --enable-default-binary install this as the default gimp binary (default=gimp_stable)], , enable_default_binary=gimp_stable)
 
-AM_CONDITIONAL(DEFAULT_BINARY, test x$enable_default_binary = xyes)
+AM_CONDITIONAL(DEFAULT_BINARY, test "x$enable_default_binary" = xyes)
 
 
 AC_ARG_ENABLE(gimp-console, [  --enable-gimp-console   build a console-only binary which does not link GTK+], , enable_gimp_console=yes)
 
-AM_CONDITIONAL(ENABLE_GIMP_CONSOLE, test x$enable_gimp_console != xno)
+AM_CONDITIONAL(ENABLE_GIMP_CONSOLE, test "x$enable_gimp_console" != xno)
 
 
 dnl Possibly change default gimpdir from .gimp-major.minor
@@ -1780,7 +1780,7 @@ if test "$INSTALL" = "$ac_install_sh"; t
 fi
 AC_SUBST(GIMPINSTALL)
 
-AM_CONDITIONAL(STATICLIBS, test x$enable_static = xyes)
+AM_CONDITIONAL(STATICLIBS, test "x$enable_static" = xyes)
 
 dnl a tuned version of glib-mkenums
 GIMP_MKENUMS="\$(PERL) \$(top_srcdir)/tools/gimp-mkenums"