--- a/gdb/cli/cli-script.c
+++ b/gdb/cli/cli-script.c
@@ -33,7 +33,10 @@
 #include "cli/cli-decode.h"
 #include "cli/cli-script.h"
 #include "gdb_assert.h"
+
+#ifdef HAVE_PYTHON
 #include "python/python.h"
+#endif
 
 /* Prototypes for local functions */
 
@@ -226,6 +229,7 @@ print_command_lines (struct ui_out *uiout, struct command_line *cmd,
 	  continue;
 	}
 
+#ifdef HAVE_PYTHON
       if (list->control_type == python_control)
 	{
 	  ui_out_field_string (uiout, NULL, "python");
@@ -237,6 +241,7 @@ print_command_lines (struct ui_out *uiout, struct command_line *cmd,
 	  list = list->next;
 	  continue;
 	}
+#endif
 
       /* ignore illegal command type and try next */
       list = list->next;
@@ -541,11 +546,16 @@ execute_control_command (struct command_line *cmd)
 	break;
       }
     case python_control:
+#ifdef HAVE_PYTHON
       {
 	eval_python_from_control_command (cmd);
 	ret = simple_control;
 	break;
       }
+#else
+      warning (_("Python scripting is not supported in this copy of GDB."));
+      break;
+#endif
 
     default:
       warning (_("Invalid control type in canned commands structure."));
@@ -915,12 +925,14 @@ read_next_line (struct command_line **command, int special_processing)
 	    first_arg++;
 	  *command = build_command_line (commands_control, first_arg);
 	}
+#ifdef HAVE_PYTHON
       else if (p1 - p == 6 && !strncmp (p, "python", 6))
 	{
 	  /* Note that we ignore the inline "python command" form
 	     here.  */
 	  *command = build_command_line (python_control, "");
 	}
+#endif
       else if (p1 - p == 10 && !strncmp (p, "loop_break", 10))
 	{
 	  *command = (struct command_line *)
@@ -1001,8 +1013,10 @@ recurse_read_control_structure (struct command_line *current_cmd)
 	{
 	  if (current_cmd->control_type == while_control
 	      || current_cmd->control_type == if_control
-	      || current_cmd->control_type == commands_control
-	      || current_cmd->control_type == python_control)
+#ifdef HAVE_PYTHON
+	      || current_cmd->control_type == python_control
+#endif
+	      || current_cmd->control_type == commands_control)
 	    {
 	      /* Success reading an entire canned sequence of commands.  */
 	      ret = simple_control;
@@ -1053,8 +1067,10 @@ recurse_read_control_structure (struct command_line *current_cmd)
          on it.  */
       if (next->control_type == while_control
 	  || next->control_type == if_control
-	  || next->control_type == commands_control
-	  || next->control_type == python_control)
+#ifdef HAVE_PYTHON
+	  || next->control_type == python_control
+#endif
+	  || next->control_type == commands_control)
 	{
 	  control_level++;
 	  ret = recurse_read_control_structure (next);
@@ -1127,8 +1143,10 @@ read_command_lines (char *prompt_arg, int from_tty, int special_processing)
 
       if (next->control_type == while_control
 	  || next->control_type == if_control
-	  || next->control_type == commands_control
-	  || next->control_type == python_control)
+#ifdef HAVE_PYTHON
+	  || next->control_type == python_control
+#endif
+	  || next->control_type == commands_control)
 	{
 	  control_level++;
 	  ret = recurse_read_control_structure (next);

--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -539,12 +539,16 @@ evaluate_subexp_standard (struct type *expect_type,
       return value_of_internalvar (exp->elts[pc + 1].internalvar);
 
     case OP_INTERNALFUNC:
+#ifdef HAVE_PYTHON
       tem = longest_to_int (exp->elts[pc + 1].longconst);
       (*pos) += 3 + BYTES_TO_EXP_ELEM (tem + 1);
       /* FIXME: handling noside == EVAL_AVOID_SIDE_EFFECTS?  */
       if (noside == EVAL_SKIP)
 	goto nosideret;
       return value_of_python (&exp->elts[pc + 2].string, tem);
+#else
+      error (_("Python scripting is not supported in this copy of GDB."));
+#endif
 
     case OP_STRING:
       tem = longest_to_int (exp->elts[pc + 1].longconst);

--- a/gdb/mi/mi-cmd-var.c
+++ b/gdb/mi/mi-cmd-var.c
@@ -237,6 +237,7 @@ mi_cmd_var_set_format (char *command, char **argv, int argc)
   return MI_CMD_DONE;
 }
 
+#ifdef HAVE_PYTHON
 enum mi_cmd_result
 mi_cmd_var_set_type_visualizer (char *command, char **argv, int argc)
 {
@@ -277,6 +278,7 @@ mi_cmd_var_set_visualizer (char *command, char **argv, int argc)
 
   return MI_CMD_DONE;
 }
+#endif /* HAVE_PYTHON */
 
 
 enum mi_cmd_result

--- a/gdb/mi/mi-cmds.c
+++ b/gdb/mi/mi-cmds.c
@@ -161,10 +161,12 @@ struct mi_cmd mi_cmds[] =
   { "var-list-children", { NULL, 0 }, 0, mi_cmd_var_list_children},
   { "var-set-format", { NULL, 0 }, 0, mi_cmd_var_set_format},
   { "var-set-frozen", { NULL, 0 }, 0, mi_cmd_var_set_frozen},
+#ifdef HAVE_PYTHON
   { "var-set-type-visualizer", { NULL, 0 }, 0, mi_cmd_var_set_type_visualizer},
   { "var-clear-type-visualizers", { NULL, 0 }, 0, 
     mi_cmd_var_clear_type_visualizers},
   { "var-set-visualizer", { NULL, 0 }, 0, mi_cmd_var_set_visualizer},
+#endif
   { "var-show-attributes", { NULL, 0 }, 0, mi_cmd_var_show_attributes},
   { "var-show-format", { NULL, 0 }, 0, mi_cmd_var_show_format},
   { "var-update", { NULL, 0 }, 0, mi_cmd_var_update},

--- a/gdb/mi/mi-cmds.h
+++ b/gdb/mi/mi-cmds.h
@@ -118,9 +118,11 @@ extern mi_cmd_argv_ftype mi_cmd_var_info_type;
 extern mi_cmd_argv_ftype mi_cmd_var_list_children;
 extern mi_cmd_argv_ftype mi_cmd_var_set_format;
 extern mi_cmd_argv_ftype mi_cmd_var_set_frozen;
+#ifdef HAVE_PYTHON
 extern mi_cmd_argv_ftype mi_cmd_var_set_type_visualizer;
 extern mi_cmd_argv_ftype mi_cmd_var_clear_type_visualizers;
 extern mi_cmd_argv_ftype mi_cmd_var_set_visualizer;
+#endif
 extern mi_cmd_argv_ftype mi_cmd_var_show_attributes;
 extern mi_cmd_argv_ftype mi_cmd_var_show_format;
 extern mi_cmd_argv_ftype mi_cmd_var_update;

--- a/gdb/value.c
+++ b/gdb/value.c
@@ -35,7 +35,10 @@
 #include "regcache.h"
 #include "block.h"
 #include "dfp.h"
+
+#ifdef HAVE_PYTHON
 #include "python/python.h"
+#endif
 
 /* Prototypes for exported functions. */
 
@@ -956,8 +959,10 @@ preserve_values (struct objfile *objfile)
   for (var = internalvars; var; var = var->next)
     preserve_one_value (var->value, objfile, copied_types);
 
+#ifdef HAVE_PYTHON
   for (val = values_in_python; val; val = val->next)
     preserve_one_value (val, objfile, copied_types);
+#endif
 
   htab_delete (copied_types);
 }

--- a/gdb/varobj.c
+++ b/gdb/varobj.c
@@ -33,8 +33,10 @@
 #include "varobj.h"
 #include "vec.h"
 
+#ifdef HAVE_PYTHON
 #include "python/python.h"
 #include "python/python-internal.h"
+#endif
 
 /* Non-zero if we want to see trace of varobj level stuff.  */
 
@@ -130,11 +132,13 @@ struct varobj
   /* Children of this object.  */
   VEC (varobj_p) *children;
 
+#ifdef HAVE_PYTHON
   /* Whether the children of this varobj were requested.  This field is
      used to decide if dynamic varobj should recompute their children.
      In the event that the frontend never asked for the children, we
      can avoid that.  */
   int children_requested;
+#endif
 
   /* Description of the root variable. Points to root variable for children. */
   struct varobj_root *root;
@@ -158,11 +162,13 @@ struct varobj
      frozen.  */
   int not_fetched;
 
+#ifdef HAVE_PYTHON
   /* A Python object used to visualize this variable object.  
      FIXME: free this in dtor.
    */
   PyObject *value_formatter;
   PyObject *children_lister;
+#endif
 };
 
 struct cpstack
@@ -179,6 +185,7 @@ struct vlist
   struct vlist *next;
 };
 
+#ifdef HAVE_PYTHON
 typedef struct type_visualizer
 {
   char *type_regexp;
@@ -186,6 +193,7 @@ typedef struct type_visualizer
 } type_visualizer;
 
 DEF_VEC_O (type_visualizer);
+#endif
 
 /* Private function prototypes */
 
@@ -231,7 +239,9 @@ static char *cppop (struct cpstack **pstack);
 static int install_new_value (struct varobj *var, struct value *value, 
 			      int initial);
 
+#ifdef HAVE_PYTHON
 static void install_default_visualizer (struct varobj *var);
+#endif
 
 static struct value *
 value_struct_element_by_name (struct value *value, const char *name);
@@ -253,8 +263,11 @@ static struct value *value_of_child (struct varobj *parent, int index);
 static char *my_value_of_variable (struct varobj *var);
 
 static char *value_get_print_value (struct value *value,
-				    enum varobj_display_formats format,
-				    PyObject *value_formatter);
+				    enum varobj_display_formats format
+#ifdef HAVE_PYTHON
+				    , PyObject *value_formatter
+#endif
+				   );
 
 static int varobj_value_is_changeable_p (struct varobj *var);
 
@@ -423,7 +436,9 @@ static int rootcount = 0;	/* number of root varobjs in the list */
 /* Pointer to the varobj hash table (built at run time) */
 static struct vlist **varobj_table;
 
+#ifdef HAVE_PYTHON
 static VEC (type_visualizer) *type_visualizers = NULL;
+#endif
 
 /* Is the variable X one of our "fake" children? */
 #define CPLUS_FAKE_CHILD(x) \
@@ -584,7 +599,9 @@ varobj_create (char *objname,
     }
 
   discard_cleanups (old_chain);
+#ifdef HAVE_PYTHON
   install_default_visualizer (var);
+#endif
   return var;
 }
 
@@ -714,13 +731,17 @@ varobj_set_display_format (struct varobj *var,
       && var->value && !value_lazy (var->value))
     {
       free (var->print_value);
-      var->print_value = value_get_print_value (var->value, var->format,
-						var->value_formatter);
+      var->print_value = value_get_print_value (var->value, var->format
+#ifdef HAVE_PYTHON
+						, var->value_formatter
+#endif
+					       );
     }
 
   return var->format;
 }
 
+#ifdef HAVE_PYTHON
 void 
 varobj_set_visualizer (struct varobj *var, const char *visualizer)
 {
@@ -802,6 +823,7 @@ varobj_clear_type_visualizers (const char *type_regexp, const char *visualizer)
 {
   VEC_free (type_visualizer, type_visualizers);
 }
+#endif /* HAVE_PYTHON */
 
 enum varobj_display_formats
 varobj_get_display_format (struct varobj *var)
@@ -838,6 +860,7 @@ varobj_get_num_children (struct varobj *var)
   return var->num_children;
 }
 
+#ifdef HAVE_PYTHON
 static
 int update_dynamic_varobj_children (struct varobj *var,
 				    VEC (varobj_p) **changed,
@@ -928,6 +951,7 @@ int update_dynamic_varobj_children (struct varobj *var,
 
   return children_changed;
 }
+#endif /* HAVE_PYTHON */
 
 /* Creates a list of the immediate children of a variable object;
    the return code is the number of such children or -1 on error */
@@ -939,6 +963,7 @@ varobj_list_children (struct varobj *var)
   char *name;
   int i;
 
+#ifdef HAVE_PYTHON
   var->children_requested = 1;
 
   if (var->children_lister)
@@ -949,6 +974,7 @@ varobj_list_children (struct varobj *var)
       update_dynamic_varobj_children (var, NULL, NULL);
       return var->children;      
     }
+#endif
 
   if (var->num_children == -1)
     var->num_children = number_of_children (var);
@@ -974,13 +1000,16 @@ varobj_list_children (struct varobj *var)
 	  name = name_of_child (var, i);
 	  existing = create_child (var, i, name);
 	  VEC_replace (varobj_p, var->children, i, existing);
+#ifdef HAVE_PYTHON
 	  install_default_visualizer (existing);
+#endif
 	}
     }
 
   return var->children;
 }
 
+#ifdef HAVE_PYTHON
 struct varobj *
 varobj_add_child (struct varobj *var, const char *name, struct value *value)
 {
@@ -991,6 +1020,7 @@ varobj_add_child (struct varobj *var, const char *name, struct value *value)
   install_default_visualizer (v);
   return v;
 }
+#endif
 
 /* Obtain the type of an object Variable as a string similar to the one gdb
    prints on the console */
@@ -1192,11 +1222,13 @@ install_new_value (struct varobj *var, struct value *value, int initial)
   gdb_assert (var->type || CPLUS_FAKE_CHILD (var));
   changeable = varobj_value_is_changeable_p (var);
 
+#ifdef HAVE_PYTHON
   /* If the type has custom visualizer, we consider it to be always
      changeable. FIXME: need to make sure this behaviour will not
      mess up read-sensitive values.  */
   if (var->value_formatter || var->children_lister)
     changeable = 1;
+#endif
 
   need_to_fetch = changeable;
 
@@ -1255,8 +1287,11 @@ install_new_value (struct varobj *var, struct value *value, int initial)
      should not be fetched.  */
   if (value && !value_lazy (value))
     {
-      print_value = value_get_print_value (value, var->format, 
-					   var->value_formatter);
+      print_value = value_get_print_value (value, var->format
+#ifdef HAVE_PYTHON
+					   , var->value_formatter
+#endif
+					  );
     }
 
   /* If the type is changeable, compare the old and the new values.
@@ -1322,6 +1357,7 @@ install_new_value (struct varobj *var, struct value *value, int initial)
   return changed;
 }
 
+#ifdef HAVE_PYTHON
 void install_default_visualizer (struct varobj *var)
 {
   char *type = varobj_get_type (var);
@@ -1341,6 +1377,7 @@ void install_default_visualizer (struct varobj *var)
       xfree (type);
     }
 }
+#endif
 
 /* Update the values for a variable and its children.  This is a
    two-pronged attack.  First, re-parse the value for the root's
@@ -1419,8 +1456,10 @@ varobj_update (struct varobj **varp, int explicit)
 	r.status = VAROBJ_NOT_IN_SCOPE;
       r.value_installed = 1;
 
+#ifdef HAVE_PYTHON
       if (r.type_changed)
 	install_default_visualizer (*varp);
+#endif
       
       if (r.status == VAROBJ_NOT_IN_SCOPE)
 	{
@@ -1456,6 +1495,7 @@ varobj_update (struct varobj **varp, int explicit)
 	    }
 	}
 
+#ifdef HAVE_PYTHON
       /* We probably should not get children of a varobj that has 
 	 children_lister, but for which -var-list-children was never
 	 invoked.  Presumably, such varobj is not yet expanded in the
@@ -1491,6 +1531,7 @@ varobj_update (struct varobj **varp, int explicit)
 	    VEC_safe_push (varobj_update_result, result, &r);
 	  continue;
 	}
+#endif /* HAVE_PYTHON */
 
       /* Push any children.  Use reverse order so that the first
 	 child is popped from the work stack first, and so
@@ -1776,9 +1817,11 @@ new_variable (void)
   var->print_value = NULL;
   var->frozen = 0;
   var->not_fetched = 0;
+#ifdef HAVE_PYTHON
   var->value_formatter = NULL;
   var->children_lister = NULL;
   var->children_requested = 0;
+#endif
 
   return var;
 }
@@ -1811,8 +1854,10 @@ free_variable (struct varobj *var)
       xfree (var->root);
     }
 
+#ifdef HAVE_PYTHON
   Py_XDECREF (var->value_formatter);
   Py_XDECREF (var->children_lister);
+#endif
 
   xfree (var->name);
   xfree (var->obj_name);
@@ -2085,8 +2130,12 @@ my_value_of_variable (struct varobj *var)
 }
 
 static char *
-value_get_print_value (struct value *value, enum varobj_display_formats format,
-		       PyObject *value_formatter)
+value_get_print_value (struct value *value, enum varobj_display_formats format
+#ifdef HAVE_PYTHON
+/* FIXME: this ifdef block is very ugly!  */
+		       , PyObject *value_formatter
+#endif
+		      )
 {
   long dummy;
   struct ui_file *stb;
@@ -2096,6 +2145,7 @@ value_get_print_value (struct value *value, enum varobj_display_formats format,
   if (value == NULL)
     return NULL;
 
+#ifdef HAVE_PYTHON
   if (value_formatter)
     {
       /* FIXME: we *might* want to provide this functionality as
@@ -2132,6 +2182,7 @@ value_get_print_value (struct value *value, enum varobj_display_formats format,
       do_cleanups (back_to);
       return xstrdup (s);				       
     }
+#endif /* HAVE_PYTHON */
 
   stb = mem_fileopen ();
   old_chain = make_cleanup_ui_file_delete (stb);
@@ -2592,10 +2643,12 @@ c_value_of_variable (struct varobj *var)
      catch that case explicitly.  */
   struct type *type = get_type (var);
 
+#ifdef HAVE_PYTHON
   /* If we have a custom formatter, return whatever string it has
      produced.  */
   if (var->value_formatter && var->print_value)
     return xstrdup (var->print_value);
+#endif
   
   /* Strip top-level references. */
   while (TYPE_CODE (type) == TYPE_CODE_REF)