-@@ -784,13 +733,13 @@ AC_MSG_RESULT($G_THREAD_LIBS)
- dnl determination of G_THREAD_CFLAGS
- dnl ********************************
-
--if test x"$have_threads" != xnone; then
-+if test "x$have_threads" != xnone; then
- G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_REENTRANT" # good default guess
-
- case $host in
- *-aix*)
- G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_THREAD_SAFE"
-- if test x"$GCC" = xyes; then
-+ if test "x$GCC" = xyes; then
- G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads"
- fi
- ;;
-@@ -822,7 +771,7 @@ fi
- dnl check for mt safe function variants
- dnl ***********************************
-
--if test x"$have_threads" != xnone; then
-+if test "x$have_threads" != xnone; then
- glib_save_LIBS="$LIBS"
- glib_save_CFLAGS="$CFLAGS"
- # we are not doing the following for now, as this might require glib
-@@ -854,49 +803,68 @@ if test x"$have_threads" != xnone; then