From: Julien Rioux <jrioux@lyx.org>
Date: Wed, 15 Jun 2011 22:31:03 +0000 (+0000)
Subject: configure.py : Simplify things a bit. With this
X-Git-Tag: 2.1.0beta1~3049
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=46813f1b5b71c660125f7ea0ee0fdad66b35c91c;p=features.git

configure.py : Simplify things a bit. With this
commit, a program is checked only once instead of twice, and
it is added as alternative editor and viewer.  The ordering
of rc entries in lyxrc.defaults is changed slightly, but
nothing is lost.

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

diff --git a/lib/configure.py b/lib/configure.py
index 6fe2f275dc..3a95ac94ab 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -336,8 +336,8 @@ def checkEditorNoRC(description, progs, rc_entry = [], path = []):
 
 def checkViewerEditor(description, progs, rc_entry = [], path = []):
     ''' The same as checkProgAlternatives, but for viewers and editors '''
-    checkEditorNoRC(description, progs, rc_entry, path)
-    return checkViewer(description, progs, rc_entry, path)
+    alt_rc_entry = listAlternatives(progs, ['editor', 'viewer'], rc_entry)
+    return checkProgAlternatives(description, progs, rc_entry, alt_rc_entry, path, not_found = 'auto')
 
 
 def checkDTLtools():