Remove PYTHONPATH from the environment on Windows

This make sure to use the the modules distributed with LyX,
avoiding reconfigure failures.

(cherry picked from commit ad0c9a548bf9e0c5038f2731aef766e0d0e8c266)

diff --git a/src/support/os_win32.cpp b/src/support/os_win32.cpp
index 8d521383f205e3dec828f379a5c1cb40bce0a68f..6e5d6d8ca135e64e226e841276eed1d296eebc26 100644 (file)
--- a/src/support/os_win32.cpp
+++ b/src/support/os_win32.cpp
@@ -158,6 +158,11 @@ void init(int argc, char ** argv[])
         */
 
 
+       // Remove PYTHONPATH from the environment as it may point to an
+       // external python installation and cause reconfigure failures.
+       unsetEnv("PYTHONPATH");
+
+
 #if defined(_MSC_VER) && (_MSC_VER >= 1900)
        // Removing an argument from argv leads to an assertion on Windows
        // when compiling with MSVC 2015 in debug mode (see bug #10440).

diff --git a/status.23x b/status.23x
index 08f5fcc1244c06db7b222f667cc012e5054b39ef..7032895472bea488dd34f0303a897372420fea6a 100644 (file)
--- a/status.23x
+++ b/status.23x
@@ -142,6 +142,9 @@ What's new
 
 * INTERNALS
 
+- Fix reconfigure issues on Windows in the presence of an external
+  python installation.
+
 
 
 * DOCUMENTATION AND LOCALIZATION