Common subdirectories: MySQL-python-1.2.1c3-old/MySQLdb and MySQL-python-1.2.1c3/MySQLdb Only in MySQL-python-1.2.1c3: build Common subdirectories: MySQL-python-1.2.1c3-old/doc and MySQL-python-1.2.1c3/doc diff -u -w MySQL-python-1.2.1c3-old/setup.py MySQL-python-1.2.1c3/setup.py --- MySQL-python-1.2.1c3-old/setup.py 2005-05-12 04:02:42.000000000 +0200 +++ MySQL-python-1.2.1c3/setup.py 2005-05-12 20:13:23.460040966 +0200 @@ -75,14 +75,21 @@ s = s[1:-1] return s - include_dirs = [ dequote(i[2:]) for i in config('include') if i.startswith('-i') ] + def dummy(s): + return s + + include_dirs = [ dequote(i[2:]) for i in config('cflags') if i.startswith('-I') ] if mysqlclient == "mysqlclient": libs = config("libs") elif mysqlclient == "mysqlclient_r": libs = config("libs_r") + if not libs: + libs = config("libs") # mysql 4.0.15 and earlier do not have --libs_r elif mysqlclient == "mysqld": libs = config("embedded") + else: + raise SystemExit, 1 library_dirs = [ dequote(i[2:]) for i in libs if i.startswith("-L") ] libraries = [ dequote(i[2:]) for i in libs if i.startswith("-l") ] @@ -90,7 +97,8 @@ if "z" not in libraries: libraries.append("z") - extra_compile_args = config("cflags") + # mysql 4.0.15 and earlier put here the include path, so zap it + extra_compile_args = [ dummy(i) for i in config("cflags") if not i.startswith('-I') ] if mysqlstatic: extra_objects.append(os.path.join(