update m4 file for doxygen macro
Merge branch 'master' into jz