Amend [d30da478d/lyxgit]

Some non-stable code was erroneously cherry-picked.

Fixes: #11642

diff --git a/lib/configure.py b/lib/configure.py
index 504b67122af5e62473bdd41df1319477a8d4660b..23b631f9dc27243da3a41aaa9b6893a07bfedba1 100644 (file)
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -1605,11 +1605,8 @@ def processModuleFile(file, filename, bool_docbook):
             cm.write(line + '\n')
         cm.close()
 
-    local = "true"
-    if (file.startswith(srcdir)):
-        local = "false"
-    return ('"%s" "%s" "%s" "%s" "%s" "%s" "%s" "%s"\n'
-            % (modname, filename, desc, pkgs, req, excl, catgy, local))
+    return ('"%s" "%s" "%s" "%s" "%s" "%s" "%s"\n'
+            % (modname, filename, desc, pkgs, req, excl, catgy))
 
 
 def checkCiteEnginesConfig():

diff --git a/status.23x b/status.23x
index 61f3d0d09e4b0b3843bef6f3f46a896ff0c7158e..dd96002a09725da482aef4e672fa6c1adf4af051 100644 (file)
--- a/status.23x
+++ b/status.23x
@@ -105,6 +105,8 @@ What's new
 
 * USER INTERFACE
 
+- Fix configure process with Python 3 (bug 11642).
+
 - Fix some numbering issues with bibitems (bug 2743, 8499).
 
 - Deal properly with orphaned bibitems (bug 7160).