Author: jrioux
Date: Thu Jun 16 00:31:03 2011
New Revision: 39079
URL: http://www.lyx.org/trac/changeset/39079
Log:
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.
Modified:
lyx-devel/trunk/lib/configure.py
Modified: lyx-devel/trunk/lib/configure.py
==============================================================================
--- lyx-devel/trunk/lib/configure.py Thu Jun 16 00:27:44 2011 (r39078)
+++ lyx-devel/trunk/lib/configure.py Thu Jun 16 00:31:03 2011 (r39079)
@@ -336,8 +336,8 @@
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():
