* lib/configure.py:

	- Use verbose htlatex command instead of oolatex, if available,
	  since the latter caused problems on some systems (bug 4604).

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

diff --git a/lib/configure.py b/lib/configure.py
index c5214989c5bb930c0bae7ac2499c1a5c5b404c7f..84bbbe68bd9496865c39f98ad66e92a1b4d12b2a 100644 (file)
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -381,9 +381,10 @@ def checkConverterEntries():
         rc_entry = [ r'\converter odt        latex      "%%"   ""' ])
     # On SuSE the scripts have a .sh suffix, and on debian they are in /usr/share/tex4ht/
     # Both SuSE and debian have oolatex
-    checkProg('a LaTeX -> Open Document converter', ['oolatex $$i', 'oolatex.sh $$i', \
-        '/usr/share/tex4ht/oolatex $$i', \
-        'htlatex $$i \'xhtml,ooffice\' \'ooffice/! -cmozhtf\' \'-coo\' \'-cvalidate\''],
+    checkProg('a LaTeX -> Open Document converter', [
+        'htlatex $$i \'xhtml,ooffice\' \'ooffice/! -cmozhtf\' \'-coo\' \'-cvalidate\'', \
+       'oolatex $$i', 'oolatex.sh $$i', \
+        '/usr/share/tex4ht/oolatex $$i'],
         rc_entry = [ r'\converter latex      odt        "%%"   "needaux"' ])
     # On windows it is called latex2rt.exe
     checkProg('a LaTeX -> RTF converter', ['latex2rtf -p -S -o $$o $$i', 'latex2rt -p -S -o $$o $$i'],