improve fink support, closes #1911