From: Julien Rioux <jrioux@lyx.org>
Date: Wed, 7 Sep 2011 23:56:38 +0000 (+0000)
Subject: * configure.py : Fix the detection of htmltolatex (#6339)
X-Git-Tag: 2.1.0beta1~2741
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=e887f514688d972bd520362765f41107ff400f17;p=features.git

* 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
---

diff --git a/lib/configure.py b/lib/configure.py
index 71bae77b9a..d1ed7f72cb 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -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'], 
         rc_entry = [ r'\converter sweave      r      "%%"    ""' ])
     #
-    checkProg('an HTML -> LaTeX converter', ['html2latex $$i', 'gnuhtml2latex $$i', \
-        'htmltolatex -input $$i -output $$o', 'java -jar htmltolatex.jar -input $$i -output $$o'],
-        rc_entry = [ r'\converter html       latex      "%%"	""' ])
+    path, htmltolatex = checkProg('an HTML -> LaTeX converter', ['html2latex $$i',
+        'gnuhtml2latex $$i', 'htmltolatex -input $$i -output $$o', 'htmltolatex.jar'],
+        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'],
         rc_entry = [ r'\converter word       latex      "%%"	""' ])