Update m4 files from ddm4, and fix clang warning.