Better test for conflict between optimization and FORTIFY_SOURCE
Fix crash with libdib >= 0.9.0

Based on a patch provided by Colin Law
Merge branch 'maint'

* Mike Alexander's Better test for conflict between optimization and FORTIFY_SOURCE
* Fix crash with libdbi >= 0.9.0, based on a patch by Colin Law