merge with trunk/2.5 at r23876

[[Split portion of a mixed commit.]]

source/gameengine/GamePlayer/ghost/SConscript

@@ -40,9 +40,13 @@ incs = ['.',
         '#source/blender/gpu',
         '#extern/glew/include']
 
-incs += Split(env['BF_PYTHON_INC'])
-
 defs = []
+
+if env['WITH_BF_PYTHON']:
+	incs += ' ' + env['BF_PYTHON_INC']
+else:
+	defs.append('DISABLE_PYTHON')
+
 if env['WITH_BF_FFMPEG']:
     defs.append('WITH_FFMPEG')