Keep automake from complaining "automake: but option 'subdir-objects' is disabled"
bootstrap.sh now offers build tips on OS X and defaults to glibtoolize
Merge remote-tracking branch 'refs/remotes/origin/master'