From: Enrico Forestieri <forenr@lyx.org>
Date: Wed, 1 Jun 2011 00:40:03 +0000 (+0000)
Subject: On Windows, not all file systems provide for a short form of a filename,
X-Git-Tag: 2.1.0beta1~3139
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=ef51dbff8ee7c624478ab4c45b9e5abb227c2d71;p=lyx.git

On Windows, not all file systems provide for a short form of a filename,
so we have to account for this. Also, when checking whether TeX allows
spaces in file names, we try different quoting styles in order to account
for the kind of TeX engine used.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38907 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/lib/configure.py b/lib/configure.py
index 7b76d69d67..ba87cd7104 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -117,6 +117,8 @@ def checkTeXPaths():
         os.write(fd, r'\relax')
         os.close(fd)
         latex_out = cmdOutput(r'latex "\nonstopmode\input{%s}"' % inpname)
+        if 'Error' in latex_out:
+            latex_out = cmdOutput(r'latex "\nonstopmode\input{\"%s\"}"' % inpname)
         if 'Error' in latex_out:
             logger.warning("configure: TeX engine needs posix-style paths in latex files")
             windows_style_tex_paths = 'false'
@@ -1300,8 +1302,10 @@ def checkTeXAllowSpaces():
         msg = "Checking whether TeX allows spaces in file names... "
         writeToFile('a b.tex', r'\message{working^^J}' )
         if LATEX != '':
-            if os.name == 'nt':
+            if os.name == 'nt' or sys.platform == 'cygwin':
                 latex_out = cmdOutput(LATEX + r""" "\nonstopmode\input{\"a b\"}" """)
+                if not 'working' in latex_out:
+                    latex_out = cmdOutput(LATEX + r' "\nonstopmode\input{a b}"')
             else:
                 latex_out = cmdOutput(LATEX + r""" '\nonstopmode\input{"a b"}' """)
         else: