Index: makeinfo/makeinfo.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/makeinfo.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- makeinfo/makeinfo.c	2003/12/13 11:00:42	1.2
+++ makeinfo/makeinfo.c	2003/12/13 11:11:56	1.3
@@ -1,5 +1,5 @@
 /* makeinfo -- convert Texinfo source into other formats.
-   $Id: makeinfo.c,v 1.2 2003/12/13 11:00:42 dirt Exp $
+   $Id: makeinfo.c,v 1.3 2003/12/13 11:11:56 dirt Exp $
 
    Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
    2000, 2001, 2002, 2003 Free Software Foundation, Inc.
@@ -739,6 +739,17 @@ For more information about these matters
           usage (1);
           break;
         }
+    }
+
+  /* If TEXINFO_XML_OUTPUT envvar is set, we default to XML output.  */
+  if (getenv ("TEXINFO_XML_OUTPUT") != NULL
+      && !STREQ (getenv ("TEXINFO_XML_OUTPUT"), "0"))
+    {
+      splitting = 0;
+      html = 0;
+      docbook = 0;
+      xml = 1;
+      process_xml = 1;
     }
 
   if (macro_expansion_output_stream)