713,738d712
< # Check for mysql.
< #
< mysql_config = WhereIs('mysql_config')
< have_mysql = bool(mysql_config)
<
< # Check MySQL version.
< if have_mysql:
< mysql_version = readCommand(mysql_config + ' --version')
< min_mysql_version = '4.1'
< if compareVersions(mysql_version, min_mysql_version) < 0:
< print 'Warning: MySQL', min_mysql_version, 'or newer required.'
< print ' Version', mysql_version, 'detected.'
< have_mysql = False
<
< # Set up mysql_config commands.
< if have_mysql:
< mysql_config_include = mysql_config + ' --include'
< if os.system(mysql_config_include + ' > /dev/null') != 0:
< # older mysql_config versions don't support --include, use
< # --cflags instead
< mysql_config_include = mysql_config + ' --cflags | sed s/\\\'//g'
< # This seems to work in all versions
< mysql_config_libs = mysql_config + ' --libs'
<
< ######################################################################
< #
823d796
< BoolVariable('USE_MYSQL', 'Use MySQL for stats output', have_mysql),
832c805
< export_vars += ['FULL_SYSTEM', 'USE_FENV', 'USE_MYSQL',
---
> export_vars += ['FULL_SYSTEM', 'USE_FENV',
997,1006d969
< if env['USE_MYSQL']:
< if not have_mysql:
< print "Warning: MySQL not available; " \
< "forcing USE_MYSQL to False in", variant_dir + "."
< env['USE_MYSQL'] = False
< else:
< print "Compiling in", variant_dir, "with MySQL support."
< env.ParseConfig(mysql_config_libs)
< env.ParseConfig(mysql_config_include)
<