Merge in changes from the trunk

This commit is contained in:
adustman
2005-04-03 04:23:18 +00:00
parent 92fb64114b
commit a4892cd07e
5 changed files with 19 additions and 9 deletions

View File

@ -37,7 +37,7 @@ embedded_server = (mysqlclient == 'mysqld')
name = "MySQL-%s" % os.path.basename(sys.executable)
if embedded_server:
name = name + "-embedded"
version = "1.1.10"
version = "1.2.0"
extra_objects = []
@ -62,9 +62,12 @@ else:
def config(what):
from os import popen
return popen("mysql_config --%s" % what).read().strip().split()
f = popen("mysql_config --%s" % what)
data = f.read().strip().split()
if f.close(): data = []
return data
include_dirs = [ i[2:] for i in config('include') ]
include_dirs = [ i[2:] for i in config('include') if i.startswith('-i') ]
if mysqlclient == "mysqlclient":
libs = config("libs")