97,99c97
< subp = subprocess.Popen("gm4 --version", shell=True, stdout=subprocess.PIPE,
< stderr=subprocess.STDOUT, close_fds=True)
< if subp.communicate()[0].find('GNU') >= 0:
---
> if m4env.Detect('gm4'):
103c101,102
< if not m4env.get('M4'):
---
> import SCons.Tool.m4
> if not SCons.Tool.m4.exists(m4env):