Add in swig-1 support again, still buildfails