--- configure.ac.old	2007-01-17 18:46:17.000000000 +0100
+++ configure.ac	2007-01-17 18:58:35.000000000 +0100
@@ -119,14 +119,12 @@
 AC_SUBST(GW_LANGUAGES)
 
 dnl Check for optional libraries
-AC_CHECK_PROG(have_glib, glib-config, yes, no)
-if test "$have_glib" = yes; then
-  PKG_CHECK_MODULES(GLIB, glib, [echo building GLib 1.2 support])
-else
-  echo Not building Glib 1.2 support
-fi
-AM_CONDITIONAL(HAVE_GLIB, test "$have_glib" = yes)
+AC_ARG_WITH([glib], AS_HELP_STRING([--without-glib], [Build without glib (default: test)]))
 
+if test "x$with_glib" != "xno"; then
+  PKG_CHECK_MODULES([GLIB], [echo building GLib support], [echo Not building GLib support])
+fi
+AM_CONDITIONAL(HAVE_GLIB, test $GLIB = yes)
 
 dnl Check for compiler flags and warnings. This should be last, since
 dnl it can infere with other checks due to changed CFLAGS.