From: Steve Reinhardt <stever@eecs.umich.edu>
Date: Thu, 3 Nov 2005 18:13:31 +0000 (-0500)
Subject: Check for MySQL 4.1 or newer only
X-Git-Tag: m5_2.0_beta1~313
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d9f94e966ba42aabace6e9d308768473346c7098;p=gem5.git

Check for MySQL 4.1 or newer only
(3.23 does not work as we supposed it did).

--HG--
extra : convert_revision : d87dbebe0b2387fde1f8aba52625d115d31baf1a
---

diff --git a/build/SConstruct b/build/SConstruct
index 2d5ca0057..cbb966196 100644
--- a/build/SConstruct
+++ b/build/SConstruct
@@ -202,10 +202,8 @@ if have_mysql:
     mysql_minor = int(mysql_version[1])
     # This version check is probably overly conservative, but it deals
     # with the versions we have installed.
-    if mysql_major < 3 or \
-           mysql_major == 3 and mysql_minor < 23 or \
-           mysql_major == 4 and mysql_minor < 1:
-        print "Warning: MySQL v3.23 or v4.1 or newer required."
+    if mysql_major < 4 or (mysql_major == 4 and mysql_minor < 1):
+        print "Warning: MySQL v4.1 or newer required."
         have_mysql = False
 
 # Set up mysql_config commands.