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 6fe2f275dc913a53e21ed8b54044a01f5cd2fbaf..3a95ac94ab95398c2d2e4525e03fbb301869059a 100644 (file)
--- 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():