Patches for configure.in bug [sf#1522900] [#692]