Alex Fernandez's elyxer detection patch for trunk.

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

diff --git a/lib/configure.py b/lib/configure.py
index 5456c2562a805043c3efcf7824c678cc31862ae5..d85b3a3e79b9e3c233c4d4b238a45bb21201af3c 100644 (file)
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -616,16 +616,14 @@ def checkConverterEntries():
     #
     checkProg('an MS Word -> LaTeX converter', ['wvCleanLatex $$i $$o'],
         rc_entry = [ r'\converter word       latex      "%%"   ""' ])
-    # eLyXer: search as a Python module and then as an executable (elyxer.py, elyxer)
     elyxerfound = checkModule('elyxer')
     if elyxerfound:
       addToRC(r'''\converter lyx      html       "python -m elyxer --directory $$r $$i $$o"    ""''')
     else:
-      path, elyxer = checkProg('a LyX -> HTML converter', ['elyxer.py', 'elyxer'],
-        rc_entry = '')
+      path, elyxer = checkProg('a LyX -> HTML converter', ['elyxer.py --directory $$r $$i $$o', 'elyxer --directory $$r $$i $$o'],
+        rc_entry = [ r'\converter lyx      html       "%%"     ""' ])
       if elyxer.find('elyxer') >= 0:
         elyxerfound = True
-        addToRC(r'''\converter lyx      html       "python -tt elyxer.py --directory $$r $$i $$o"      ""''')
 
     if elyxerfound:
       addToRC(r'''\copier    html       "python -tt $$s/scripts/ext_copy.py -e html,png,jpg,jpeg,css $$i $$o"''')