From: Julien Rioux <jrioux@lyx.org>
Date: Sun, 18 Sep 2011 12:10:19 +0000 (+0000)
Subject: * configure.py : Add lyxpreview unconditionnally.
X-Git-Tag: 2.1.0beta1~2697
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=ce6a179489f47d3631579d4cb77f6d1ce523bf7a;p=features.git

* configure.py : Add lyxpreview unconditionnally.

The check on dv2dt and dt2dv is not necessary, since even if these
are not available, we fall back to the legacy convertion method,
which uses ghostscript, and which is available in all cases.

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

diff --git a/lib/configure.py b/lib/configure.py
index 8e8ed5f965..3a9257ee32 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -743,19 +743,6 @@ def checkConverterEntries(java='', perl=''):
     checkProg('a DVI to PDF converter', ['dvipdfmx -o $$o $$i', 'dvipdfm -o $$o $$i'],
         rc_entry = [ r'\converter dvi        pdf3       "%%"	""' ])
     #
-    path, dvipng = checkProg('dvipng', ['dvipng'])
-    path, dv2dt  = checkProg('DVI to DTL converter', ['dv2dt'])
-    if dvipng == "dvipng" and dv2dt == 'dv2dt':
-        addToRC(r'\converter lyxpreview png        "python -tt $$s/scripts/lyxpreview2bitmap.py --png"	""')
-    else:
-        # set empty converter to override the default imagemagick
-        addToRC(r'\converter lyxpreview png        ""	""')
-    if dv2dt == 'dv2dt':
-        addToRC(r'\converter lyxpreview ppm        "python -tt $$s/scripts/lyxpreview2bitmap.py --ppm"	""')
-    else:
-        # set empty converter to override the default imagemagick
-        addToRC(r'\converter lyxpreview ppm        ""	""')
-    #
     checkProg('a fax program', ['kdeprintfax $$i', 'ksendfax $$i', 'hylapex $$i'],
         rc_entry = [ r'\converter ps         fax        "%%"	""'])
     #
@@ -910,6 +897,8 @@ def checkConverterEntries(java='', perl=''):
 \converter clyx       lyx        "python -tt $$s/lyx2lyx/lyx2lyx -c big5 $$i > $$o"	""
 \converter jlyx       lyx        "python -tt $$s/lyx2lyx/lyx2lyx -c euc_jp $$i > $$o"	""
 \converter klyx       lyx        "python -tt $$s/lyx2lyx/lyx2lyx -c euc_kr $$i > $$o"	""
+\converter lyxpreview png        "python -tt $$s/scripts/lyxpreview2bitmap.py --png"	""
+\converter lyxpreview ppm        "python -tt $$s/scripts/lyxpreview2bitmap.py --ppm"	""
 ''')