From: Juergen Spitzmueller <spitz@lyx.org>
Date: Thu, 22 Aug 2019 15:35:56 +0000 (+0200)
Subject: Amend [d30da478d/lyxgit]
X-Git-Tag: 2.3.4~60
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=2479534e5769034ac1ed835ba98f4a9bfac03fe6;p=features.git

Amend [d30da478d/lyxgit]

Some non-stable code was erroneously cherry-picked.

Fixes: #11642
---

diff --git a/lib/configure.py b/lib/configure.py
index 504b67122a..23b631f9dc 100644
--- 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 61f3d0d09e..dd96002a09 100644
--- 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).