* configure.py : Fix the detection of htmltolatex (#6339)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39638 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Julien Rioux 2011-09-07 23:56:38 +00:00
parent d75b83e293
commit e887f51468

View File

@ -649,9 +649,14 @@ def checkConverterEntries(java='', perl=''):
checkProg('a Sweave -> R/S code converter', ['Rscript --verbose --no-save --no-restore $$s/scripts/lyxstangle.R $$i $$e $$r'], checkProg('a Sweave -> R/S code converter', ['Rscript --verbose --no-save --no-restore $$s/scripts/lyxstangle.R $$i $$e $$r'],
rc_entry = [ r'\converter sweave r "%%" ""' ]) rc_entry = [ r'\converter sweave r "%%" ""' ])
# #
checkProg('an HTML -> LaTeX converter', ['html2latex $$i', 'gnuhtml2latex $$i', \ path, htmltolatex = checkProg('an HTML -> LaTeX converter', ['html2latex $$i',
'htmltolatex -input $$i -output $$o', 'java -jar htmltolatex.jar -input $$i -output $$o'], 'gnuhtml2latex $$i', 'htmltolatex -input $$i -output $$o', 'htmltolatex.jar'],
rc_entry = [ r'\converter html latex "%%" ""' ]) rc_entry = [ r'\converter html latex "%%" ""',
r'\converter html latex "%%" ""',
r'\converter html latex "%%" ""', '', ''] )
if htmltolatex == 'htmltolatex.jar' and java != '':
addToRC(r'\converter html latex "%s -jar \"%s\" -input $$i -output $$o" ""'
% (java, os.path.join(path, htmltolatex)))
# #
checkProg('an MS Word -> LaTeX converter', ['wvCleanLatex $$i $$o'], checkProg('an MS Word -> LaTeX converter', ['wvCleanLatex $$i $$o'],
rc_entry = [ r'\converter word latex "%%" ""' ]) rc_entry = [ r'\converter word latex "%%" ""' ])