$NetBSD: patch-aa,v 1.4 2003/06/06 10:36:38 jmmv Exp $ --- setup.py.orig Thu Jul 18 14:55:36 2002 +++ setup.py Thu Nov 14 15:36:03 2002 @@ -11,7 +11,7 @@ NO = 0 # set this to YES if you have the thread-safe mysqlclient library -thread_safe_library = YES +thread_safe_library = NO # You probably don't have to do anything past this point. If you # do, please mail me the configuration for your platform. Don't @@ -23,14 +23,10 @@ mysqlclient = thread_safe_library and "mysqlclient_r" or "mysqlclient" # include files and library locations should cover most platforms -include_dirs = [ - '/usr/include/mysql', '/usr/local/include/mysql', - '/usr/local/mysql/include/mysql' - ] -library_dirs = [ - '/usr/lib/mysql', '/usr/local/lib/mysql', - '/usr/local/mysql/lib/mysql' - ] +mysqlprefix = '@MYSQLPREFIX@' +mysqlrtprefix = '@MYSQLRTPREFIX@' +include_dirs = [mysqlprefix + '/include/mysql'] +library_dirs = [mysqlprefix + '/lib/mysql'] # MySQL-3.23 and newer need libz libraries = [mysqlclient, "z"] @@ -38,7 +34,7 @@ # On some platorms, this can be used to find the shared libraries # at runtime, if they are in a non-standard location. Doesn't # work for Linux gcc. -runtime_library_dirs = [] +runtime_library_dirs = [mysqlrtprefix + '/lib/mysql'] # This can be used to force linking against static libraries. extra_objects = [] @@ -48,38 +44,6 @@ extra_compile_args = [] extra_link_args = [] -if sys.platform == "netbsd1": - include_dirs = ['/usr/pkg/include/mysql'] - library_dirs = ['/usr/pkg/lib/mysql'] -elif sys.platform in ("freebsd4", "openbsd3"): - LOCALBASE = os.environ.get('LOCALBASE', '/usr/local') - include_dirs = ['%s/include/mysql' % LOCALBASE] - library_dirs = ['%s/lib/mysql' % LOCALBASE] -elif sys.platform == "sunos5": # Solaris 2.8 + gcc - runtime_library_dirs.append('/usr/local/lib:/usr/openwin/lib:/usr/dt/lib') - extra_compile_args.append("-fPIC") -elif sys.platform == "win32": # Ugh - include_dirs = [r'c:\mysql\include'] - library_dirs = [r'c:\mysql\lib\opt'] - libraries = [mysqlclient, 'zlib', 'msvcrt', 'libcmt', - 'wsock32', 'advapi32'] - extra_objects = [r'c:\mysql\lib\opt\mysqlclient.lib'] -elif sys.platform == "cygwin": - include_dirs = ['/c/mysql/include'] - library_dirs = ['/c/mysql/lib'] - extra_compile_args.append('-DMS_WIN32') -elif sys.platform[:6] == "darwin": # Mac OS X - include_dirs.append('/sw/include') - library_dirs.append('/sw/lib') - extra_link_args.append('-flat_namespace') -elif sys.platform == 'linux2' and os.environ.get('HOSTTYPE') == 'alpha': - libraries.extend(['ots', 'cpml']) -elif os.name == "posix": # UNIX-ish platforms not covered above - pass # default should work -else: - raise "UnknownPlatform", "sys.platform=%s, os.name=%s" % \ - (sys.platform, os.name) - long_description = \ """Python interface to MySQL-3.23