Merge "Fix m4-native build with recent glibc versions" into guppy