Index: configure.ac
===================================================================
--- configure.ac	(revision 1511)
+++ configure.ac	(working copy)
@@ -251,7 +251,7 @@
 
 AM_GLIB_GNU_GETTEXT()
 
-AC_ARG_ENABLE(libintl,[  --disable-libintl        i18n support (libintl)],
+AC_ARG_ENABLE(libintl,[  --disable-libintl       i18n support (libintl)],
 [],[enable_libintl=yes])
 
 if test x$enable_libintl = xyes; then
@@ -601,8 +601,8 @@
 AC_ARG_ENABLE(ruby-site-install,
 [  --enable-ruby-site-install   by default the rrdtool ruby modules are installed
 		  	  together with rrdtool in $prefix/lib/ruby. You have to
-                          add $prefix/lib/ruby/$ruby_version/$sitearch to you $: variable
-                          for ruby to find the RRD.so file.],
+                          add $prefix/lib/ruby/$ruby_version/$sitearch to
+                          your $: variable for ruby to find the RRD.so file.],
 [RUBY_MAKE_OPTIONS=],[RUBY_MAKE_OPTIONS="sitedir="'$(DESTDIR)'"$prefix/lib/ruby"])
 
     
@@ -649,7 +649,7 @@
 	  TCL_INCLUDE_SPEC="$TCL_INCLUDE_SPEC -I$TCL_INC_DIR"
 	fi
   fi
-  AC_ARG_ENABLE(tcl,[  --enable-tcl-site        install the tcl extension in the tcl tree],
+  AC_ARG_ENABLE(tcl,[  --enable-tcl-site       install the tcl extension in the tcl tree],
   [],[enable_tcl_site=yes])
 
 fi
@@ -674,14 +674,14 @@
 
 if test  "$enable_python" = "yes"; then
 dnl Check for python
-AM_PATH_PYTHON(2.3,[],[enable_python=no])
-AM_CHECK_PYTHON_HEADERS(,[enable_python=no;AC_MSG_WARN(could not find Python headers)])
+AM_PATH_PYTHON(2.3,[],[enable_python=no;AC_MSG_ERROR([could not find a suitable python interpreter])])
+AM_CHECK_PYTHON_HEADERS(,[enable_python=no;AC_MSG_ERROR(could not find Python headers)])
 fi
 
 if test  x$enable_python = xno; then
 	COMP_PYTHON=
 else
-	COMP_PYTHON="python"
+	COMP_PYTHON="$PYTHON"
 fi
 
 AC_SUBST(COMP_PYTHON)