Try to fix configure+make after r214556