From: Ali Saidi <saidi@eecs.umich.edu>
Date: Thu, 31 May 2007 22:01:07 +0000 (-0400)
Subject: This is probably a more scons like way to do this
X-Git-Tag: m5_2.0_beta4~390^2^2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1da901d60f10c6052f48b0e14e00e07a29cafcc0;p=gem5.git

This is probably a more scons like way to do this

--HG--
extra : convert_revision : 2cbd05039bbefcc067310098c6c1c1022302fb10
---

diff --git a/ext/libelf/SConscript b/ext/libelf/SConscript
index 7affa6dcb..31e570396 100644
--- a/ext/libelf/SConscript
+++ b/ext/libelf/SConscript
@@ -94,13 +94,12 @@ if env.get('CXX'):
     m4env['CXX'] = env['CXX']
 
 # If we have gm4 use it
-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'):
     m4env['M4'] = 'gm4'
 
 # Check that m4 is available
-if not m4env.get('M4'):
+import SCons.Tool.m4
+if not SCons.Tool.m4.exists(m4env):
    print "Error: Can't find version of M4 macro processor.  " + \
          "Please install M4 and try again."
    Exit(1)