From: Enrico Forestieri <forenr@lyx.org>
Date: Sat, 12 Jan 2019 17:37:41 +0000 (+0100)
Subject: Remove PYTHONPATH from the environment on Windows
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=16a3e828ff0f8b64a2a1bec3aa44ee9ba59b718a;p=features.git

Remove PYTHONPATH from the environment on Windows

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

diff --git a/src/support/os_win32.cpp b/src/support/os_win32.cpp
index 145d506592..e15af13acf 100644
--- 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).