Patches for configure problem. [sf#1491936] [#672]