Merge pull request #2 from jsbillings/master

Use configuration macros for building software, update cacheinfo