Removed all compiler macros for vectorisation and replace with HAVE_ macros. Added WITH_VECTORIZATION #ifdef for turning vectorisation on and off.