From f7c2372ec40250c8b79c8b193752c6c666dcd288 Mon Sep 17 00:00:00 2001
From: Bo Peng <bpeng@lyx.org>
Date: Mon, 3 Jul 2006 15:34:02 +0000
Subject: [PATCH] lib/configure.py: use \nonstopmode instead of
 -interaction=nonstopmode, from JMarc and Enrico

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_4_X@14317 a592a061-630c-0410-9148-cb99ea01b6c8
---
 lib/ChangeLog    |  3 +++
 lib/configure.py | 14 +++++---------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 60a9d385e7..6babc9bd6d 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,6 @@
+2006-07-03  Jean-Marc Lasgouttes <lasgouttes@lyx.org> and Enrico Forestieri <forenr@tlc.unipr.it>
+	* configure.py: use \nonstopmode instead of -interaction=nonstopmode
+
 2006-07-02  Bo Peng <ben.bob@gmail.com>
 	* configure.py: add nonstopmode to cygwin latex check
 
diff --git a/lib/configure.py b/lib/configure.py
index b7aa93dd2d..72ac4fbc83 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -85,17 +85,16 @@ def checkTeXPaths():
     from tempfile import mkstemp
     fd, tmpfname = mkstemp(suffix='.ltx', dir='/tmp')
     os.write(fd, r'''
-\documentstyle{article}
-\begin{document}\end{document}
+\relax
   ''')
     os.close(fd)
     inpname = cmdOutput('cygpath -m ' + tmpfname)
     # a wrapper file
     wfd, wtmpfname = mkstemp(suffix='.ltx', dir='/tmp')
     wtmpfname = cmdOutput('cygpath -m ' + wtmpfname)
-    os.write(wfd, r'\input{' + inpname + '}' )
+    os.write(wfd, r'\nonstopmode\input{' + inpname + '}' )
     os.close(wfd)
-    if cmdOutput('latex -interaction=nonstopmode %s' % wtmpfname).find('Error') != -1:
+    if cmdOutput('latex %s' % wtmpfname).find('Error') != -1:
       print "configure: TeX engine needs posix-style paths in latex files"
       windows_style_tex_paths = 'false'
     else:
@@ -637,11 +636,8 @@ def checkTeXAllowSpaces():
   tex_allows_spaces = 'false'
   if lyx_check_config:
     print "Checking whether TeX allows spaces in file names... ",
-    writeToFile('a b.tex', r'\message{working^^J}' )
-    # FIXME: the bsh version uses < /dev/null which is not portable.
-    # Can anyone confirm if this option (-interaction) is available
-    # at other flavor of latex as well? (MikTex/win, Web2C/linux are fine.) 
-    if ''.join(cmdOutput(LATEX + ' -interaction=nonstopmode "a b"')).find('working') != -1:
+    writeToFile('a b.tex', r'\nonstopmode\message{working^^J}' )
+    if ''.join(cmdOutput(LATEX + ' "a b"')).find('working') != -1:
       print 'yes'
       tex_allows_spaces = 'true'
     else: