some more autoconf
not the most elegant merge
Merge branch 'feature/BitmapIndex' of https://github.com/warelab/snapdragon into feature/BitmapIndex
Merge branch 'feature/BitmapIndex' of https://github.com/warelab/snapdragon into feature/BitmapIndex