Don't hardcode cdb library
Merge pull request #1979 from rubenk/fix-hardcoded-cdb-lib

Don't hardcode cdb library