* configure.py : Fix the rc entry when tex2lyx is not found (#3308).

We still define the tex2lyx converter but we emit a warning.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39715 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/configure.py b/lib/configure.py
index 0b51dedb25ad1abb88b74bf4449da20846fabba9..7e989a3ea8aa3dd4f803c8917d171d969308292f 100644 (file)
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -665,9 +665,11 @@ def checkConverterEntries():
         os.pathsep + path_orig
 
 # First search for tex2lyx with version suffix (bug 6986)
-    checkProg('a LaTeX/Noweb -> LyX converter', ['tex2lyx' + version_suffix, 'tex2lyx'],
+    path, t2l = checkProg('a LaTeX/Noweb -> LyX converter', ['tex2lyx' + version_suffix, 'tex2lyx'],
         rc_entry = [r'''\converter latex      lyx        "%% -f $$i $$o"       ""
-\converter literate   lyx        "%% -n -f $$i $$o"    ""'''])
+\converter literate   lyx        "%% -n -f $$i $$o"    ""'''], not_found = 'tex2lyx')
+    if path == '':
+        logger.warning("Failed to find tex2lyx on your system.")
 
     os.environ["PATH"] = path_orig
 

diff --git a/status.20x b/status.20x
index d3f922d1a6fc81eddb8d2104d24abbbc9be84ba9..40cddb1f8052c9019540aaa08dfa0c9dc94d40a1 100644 (file)
--- a/status.20x
+++ b/status.20x
@@ -114,3 +114,5 @@ What's new
 * BUILD/INSTALLATION
 
 - Fix compile error with gcc 4.5.3 when using the included mythes library.
+
+- Fix the detection of the tex2lyx converter (bug 3308).