No comments in two days, so I pushed the two patches. If you notice some oddities with --conditional-dependencies, please report them as gnulib bugs. Hopefully we can move this feature from "experimental" to stable status soon.
Bruno -- In memoriam Zbigniew Iwański <http://en.wikipedia.org/wiki/Henryk_Iwański>