--- ./configure.ac.orig	2009-09-28 21:28:49.000000000 +0300
+++ ./configure.ac	2012-09-20 21:10:38.017597155 +0300
@@ -39,8 +39,8 @@
 
 AC_DEFUN([AC_PYTHON_MODULE],[
     AC_MSG_CHECKING([for python module $1])
-    $PYTHON -c "import $1" > /dev/null 2>&1
-    if test $? -eq 0; then
+    $PYTHON -c "import $1" 2>&1 | grep -q 'ImportError'
+    if test $? -ne 0; then
         AC_MSG_RESULT(yes)
     else
         AC_MSG_RESULT(no)
@@ -132,6 +132,11 @@
     AC_PYTHON_MODULE($module, t)
 done
 
+AC_ARG_ENABLE([gtk-version-check],
+    AS_HELP_STRING([--disable-gtk-version-check], [Disable GTK+ version check, use it only for non-X environment]))
+
+AS_IF([test "x$enable_gtk_version_check" != "xno"], [
+
 AC_MSG_CHECKING(for gtk+ >= $GTK_WANTVERSION)
 cat > conftest.py <<[EOF
 import sys
@@ -159,6 +164,8 @@
   AC_MSG_ERROR([GTK+ >= $GTK_WANTVERSION is required])
 fi
 
+])
+
 #
 #
 ##########################################################################