fix handling of the defines of optional deps when cross-compiling
Merge branch 'master' of github.com:mapnik/mapnik into external-image-data