Satish Balay avatar Satish Balay committed 7390fa2 Merge

Merge branch 'balay/configure-winpython-check' into maint

Comments (0)

Files changed (1)

config/configure.py

       sys.exit(3)
   return 0
 
+def chkusingwindowspython():
+  if sys.platform == 'win32':
+    print '==============================================================================='
+    print ' *** Windows python detected. Please rerun ./configure with cygwin-python. ***'
+    print '==============================================================================='
+    sys.exit(3)
+  return 0
+
 def chkcygwinpython():
   if os.path.exists('/usr/bin/cygcheck.exe') and sys.platform == 'cygwin' :
     sys.argv.append('--useThreads=0')
   chkbrokencygwin()
   # Disable threads on RHL9
   chkrhl9()
+  # Make sure cygwin-python is used on windows
+  chkusingwindowspython()
   # Threads don't work for cygwin & python...
   chkcygwinpython()
   chkcygwinlink()
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.