From fc709d0c0a402153e39fdbe559ea2fe90d4ac23e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Wed, 11 Nov 2009 22:51:19 +0000 Subject: [PATCH] configure.py: fix detection of LyX to HTML converter - only create such a converter when eLyXer was found git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31949 a592a061-630c-0410-9148-cb99ea01b6c8 --- lib/configure.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/configure.py b/lib/configure.py index beea4bd035..5456c2562a 100644 --- a/lib/configure.py +++ b/lib/configure.py @@ -432,8 +432,10 @@ def checkModule(module): msg = 'checking for "' + module + ' module"... ' try: __import__(module) + logger.info(msg + ' yes') return True except ImportError: + logger.info(msg + ' no') return False @@ -620,13 +622,15 @@ def checkConverterEntries(): 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 = [ r'\converter lyx html "python -tt elyxer.py --directory $$r $$i $$o" ""' ]) + rc_entry = '') 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"''') else: + # search for other converters than eLyXer # On SuSE the scripts have a .sh suffix, and on debian they are in /usr/share/tex4ht/ path, htmlconv = checkProg('a LaTeX -> HTML converter', ['htlatex $$i', 'htlatex.sh $$i', \ '/usr/share/tex4ht/htlatex $$i', 'tth -t -e2 -L$$b < $$i > $$o', \