Added missing guards for case when spl is built without cgal support.
Merge branch 'master' of github.com:muhrin/STools
Fixed a couple of build issues.