Another big patch set by Bastien Montagne, thanks a lot!

* Made Freestyle optional (turned on by default).

* Fix for missing bpath.c updates in the previous merge of trunk changes.

source/blender/python/intern/CMakeLists.txt

@@ -35,7 +35,6 @@ set(INC
 	../../makesrna
 	../../windowmanager
 	../../../../intern/cycles/blender
-	../../freestyle/intern/python
 	../../../../intern/guardedalloc
 )
 
@@ -140,6 +139,13 @@ if(WITH_CYCLES_OSL)
 	add_definitions(-DWITH_CYCLES_OSL)
 endif()
 
+if(WITH_FREESTYLE)
+	list(APPEND INC
+		../../freestyle/intern/python
+	)
+	add_definitions(-DWITH_FREESTYLE)
+endif()
+
 if(WITH_GAMEENGINE)
 	add_definitions(-DWITH_GAMEENGINE)
 endif()

source/blender/python/intern/bpy.c

@@ -60,7 +60,9 @@
 #include "../generic/blf_py_api.h"
 #include "../mathutils/mathutils.h"
 
-#include "BPy_Freestyle.h"
+#ifdef WITH_FREESTYLE
+#  include "BPy_Freestyle.h"
+#endif
 
 PyObject *bpy_package_py = NULL;
 
@@ -259,7 +261,9 @@ void BPy_init_modules(void)
 	}
 	/* stand alone utility modules not related to blender directly */
 	IDProp_Init_Types(); /* not actually a submodule, just types */
+#ifdef WITH_FREESTYLE
 	Freestyle_Init();
+#endif
 
 	mod = PyModule_New("_bpy");
 

source/blender/python/intern/bpy_app_build_options.c

@@ -72,6 +72,10 @@ static PyObject *make_build_options(void)
 	SetStrItem("CYCLES_OSL");
 #endif
 
+#ifdef WITH_FREESTYLE
+	SetStrItem("FREESTYLE");
+#endif
+
 #ifdef WITH_GAMEENGINE
 	SetStrItem("GAMEENGINE");
 #endif