> Please, instead of
>
> #ifdef _WIN32
> #ifndef _WIN32
>
> use
>
> #if defined(_WIN32) || defined(__CYGWIN__)
> #if !defined(_WIN32) && !defined(__CYGWIN__)
>
> in this code, as it will also work on Cygwin.

Please fix that yourself, and test this feature with the attached
configure.py patch. My windows machine is painfully slow ... I will
create a full patch when the patches are confirmed to work.

Bo
Index: lib/configure.py
===================================================================
--- lib/configure.py	(revision 13708)
+++ lib/configure.py	(working copy)
@@ -262,6 +262,55 @@
 ''')
 
 
+def autoFormatEntries():  
+  ''' Use auto for windows system (\Format entries) '''
+  addToRC(r'''\Format tgif       obj     Tgif                   "" "auto"	"auto"
+\Format fig        fig     FIG                    "" "auto"	"auto"
+\Format agr        agr     Grace                  "" "auto"	"auto"
+\Format fen        fen     FEN                    "" "auto"	"auto"
+\Format bmp        bmp     BMP                    "" "auto"	"auto"
+\Format gif        gif     GIF                    "" "auto"	"auto"
+\Format jpg        jpg     JPEG                   "" "auto"	"auto"
+\Format pbm        pbm     PBM                    "" "auto"	"auto"
+\Format pgm        pgm     PGM                    "" "auto"	"auto"
+\Format png        png     PNG                    "" "auto"	"auto"
+\Format ppm        ppm     PPM                    "" "auto"	"auto"
+\Format tiff       tif     TIFF                   "" "auto"	"auto"
+\Format xbm        xbm     XBM                    "" "auto"	"auto"
+\Format xpm        xpm     XPM                    "" "auto"	"auto"
+\Format asciichess asc    "Plain text (chess output)"  "" ""	"auto"
+\Format asciiimage asc    "Plain text (image)"         "" ""	"auto"
+\Format asciixfig  asc    "Plain text (Xfig output)"   "" ""	"auto"
+\Format dateout    tmp    "date (output)"         "" ""	"auto"
+\Format docbook    sgml    DocBook                B  ""	"auto"
+\Format docbook-xml xml   "Docbook (XML)"         "" ""	"auto"
+\Format literate   nw      NoWeb                  N  ""	"auto"
+\Format latex      tex    "TeX (latex)"           l  ""	"auto"
+\Format linuxdoc   sgml    LinuxDoc               x  ""	"auto"
+\Format pdflatex   tex    "TeX (pdflatex)"        "" ""	"auto"
+\Format text       txt    "Plain text"            a  ""	"auto"
+\Format textparagraph txt "Plain text (paragraphs)"    "" ""	"auto"
+\Format eps        eps     EPS                    "" "auto"	""
+\Format ps         ps      Postscript             t  "auto"	""
+\Format pdf        pdf    "PDF (ps2pdf)"          P  "auto"	""
+\Format pdf2       pdf    "PDF (pdflatex)"        F  "auto"	""
+\Format pdf3       pdf    "PDF (dvipdfm)"         m  "auto"	""
+\Format dvi        dvi     DVI                    D  "auto"	""
+\Format html       html    HTML                   H  "auto"	""
+\Format date       ""     "date command"          "" ""	""
+\Format fax        ""      Fax                    "" ""	""
+\Format lyx        lyx     LyX                    "" ""	""
+\Format lyx13x     lyx13  "LyX 1.3.x"             "" ""	""
+\Format lyxpreview lyxpreview "LyX Preview"       "" ""	""
+\Format pdftex     pdftex_t PDFTEX                "" ""	""
+\Format program    ""      Program                "" ""	""
+\Format pstex      pstex_t PSTEX                  "" ""	""
+\Format sxw        sxw    "OpenOffice.Org Writer" O  ""	""
+\Format word       doc    "MS Word"               W  ""	""
+\Format wordhtml   html   "MS Word (HTML)"        "" ""        ""
+''')
+
+
 def checkConverterEntries():
   ''' Check all converters (\converter entries) '''
   checkProg('the pdflatex program', ['pdflatex $$i'],
@@ -696,7 +745,10 @@
 ''')
   # check latex
   LATEX = checkLatex()
-  checkFormatEntries()
+  if os.name == 'nt':
+    autoFormatEntries()
+  else:
+    checkFormatEntries()
   checkConverterEntries()
   (chk_linuxdoc, bool_linuxdoc, linuxdoc_cmd) = checkLinuxDoc()
   (chk_docbook, bool_docbook, docbook_cmd) = checkDocBook()

Reply via email to