apply the two caching patches proposed by Christoph Grüninger,
at least for me they worked flawless and showed some considerable configure speedup.

[[Imported from SVN: r6539]]