--- ./configure.orig	2007-05-31 01:56:35.000000000 +0400
+++ ./configure	2009-05-20 01:27:42.000000000 +0400
@@ -33902,6 +33902,8 @@
 
 have_imagemagick=no
 
+if test "$have_graphicsmagick" = "no"; then
+
    { echo "$as_me:$LINENO: checking for Magick-config" >&5
 echo $ECHO_N "checking for Magick-config... $ECHO_C" >&6; }
    if test -n "$MAGICK_CONFIG"; then
@@ -34014,7 +34016,7 @@
     LIBMAGICK_RPATH=
 fi
 
-
+fi
 
 
 
@@ -38922,10 +38924,10 @@
 
 
 
-if test -z ""2.5""; then
+if test -z ""%%PYTHON_VER%%""; then
   version="1.5"
 else
-  version=""2.5""
+  version=""%%PYTHON_VER%%""
 fi
 
 { echo "$as_me:$LINENO: checking for Python$version" >&5
@@ -51126,10 +51128,10 @@
 
 
 
-if test -z ""2.5""; then
+if test -z ""%%PYTHON_VER%%""; then
   version="1.5"
 else
-  version=""2.5""
+  version=""%%PYTHON_VER%%""
 fi
 
 { echo "$as_me:$LINENO: checking for Python$version" >&5