Re: glib-2.0.m4 patch

[Eric Lemings <eric b lemings lmco com>]

'test x"$no_glib" = x' and 'test "x$no_glib" = x' does not work.

@@ -12,29 +13,9 @@
 AC_ARG_ENABLE(glibtest, [  --disable-glibtest       Do not try to compile
and run a test GLIB program],
                    , enable_glibtest=yes)

-  pkg_config_args=glib-2.0
-  for module in . $4
-  do
-      case "$module" in
-         gmodule)
-             pkg_config_args="$pkg_config_args gmodule-2.0"
-         ;;
-         gobject)
-             pkg_config_args="$pkg_config_args gobject-2.0"
-         ;;
-         gthread)
-             pkg_config_args="$pkg_config_args gthread-2.0"
-         ;;
-      esac
-  done
-
   AC_PATH_PROG(PKG_CONFIG, pkg-config, no)

-  min_glib_version=ifelse([$1], ,1.3.3,$1)
-  AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
-
   no_glib=""
-
   if test x$PKG_CONFIG != xno ; then
     if pkg-config --atleast-pkgconfig-version 0.5 ; then
       :
@@ -45,7 +26,26 @@
     fi
   fi

-  if test x"$no_glib" = x ; then
+  if test -n "$no_glib"; then
+    min_glib_version=ifelse([$1], ,1.3.3,$1)
+    AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
+
+    pkg_config_args=glib-2.0
+    for module in . $4
+    do
+        case "$module" in
+           gmodule)
+               pkg_config_args="$pkg_config_args gmodule-2.0"
+           ;;
+           gobject)
+               pkg_config_args="$pkg_config_args gobject-2.0"
+           ;;
+           gthread)
+               pkg_config_args="$pkg_config_args gthread-2.0"
+           ;;
+        esac
+    done
+
     GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
     GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
     glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
@@ -140,7 +140,8 @@
        LIBS="$ac_save_LIBS"
      fi
   fi
-  if test "x$no_glib" = x ; then
+
+  if test -n "$no_glib"; then
      AC_MSG_RESULT(yes (version
$glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version))

      ifelse([$2], , :, [$2])
   else