diff --git a/configure.in b/configure.in
index d5276d7..8bca7f0 100644
--- a/configure.in
+++ b/configure.in
@@ -12,22 +12,22 @@ AC_PROG_MAKE_SET
 
 dnl Checks for libraries.
 AC_ARG_ENABLE(gtk2,
-        [  --enable-gtk2=[no/yes]        enables the gtk2 GUI (default=yes)],,
-                 enable_gtk2=yes)
-                
-if [ ! test "x$enable_gtk2" != "xyes"]; then
-    pkg_modules="gtk+-2.0 >= 2.0.0"
-    PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
-    CFLAGS="$CFLAGS $PACKAGE_CFLAGS"
-    LIBS="$LIBS $PACKAGE_LIBS"
-    AC_DEFINE(ENABLE_GTK2, , [Define to enable gtk2 support])
-else        
-  if !(gtk-config --version >/dev/null 2>&1); then
-     AC_MSG_ERROR([Gtk+ is required.])
-  else
-      CFLAGS="$CFLAGS `gtk-config --cflags`"
-      LIBS="$LIBS `gtk-config --libs`"
-  fi
+	[AC_HELP_STRING([--enable-gtk2],[enable gtk2 GUI (instead of GTK1) [default=yes]])],,
+	[enable_gtk2=yes])
+
+if test "x$enable_gtk2" = "xyes" ; then
+	pkg_modules="gtk+-2.0 >= 2.0.0"
+	PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
+	CFLAGS="$CFLAGS $PACKAGE_CFLAGS"
+	LIBS="$LIBS $PACKAGE_LIBS"
+	AC_DEFINE(ENABLE_GTK2, , [Define to enable gtk2 support])
+else
+	if ! gtk-config --version &> /dev/null ; then
+		AC_MSG_ERROR([Gtk+ is required.])
+	else
+		CFLAGS="$CFLAGS `gtk-config --cflags`"
+		LIBS="$LIBS `gtk-config --libs`"
+	fi
 fi
 
 AC_SUBST(ENABLE_GTK2)