342N/A--- Python-2.4.3/setup.py.patch1 2006-03-23 14:07:46.000000000 -0500

1472N/A+++ Python-2.4.3/setup.py 2006-09-14 22:12:55.808430000 -0400

342N/A@@ -239,9 +239,10 @@

342N/A return sys.platform

342N/A

342N/A def detect_modules(self):

342N/A- # Ensure that /usr/local is always used

342N/A- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')

342N/A- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')

342N/A+ if sys.platform != 'sunos5':

342N/A+ # Ensure that /usr/local is always used

342N/A+ add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')

342N/A+ add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')

342N/A

342N/A # Add paths to popular package managers on OS X/darwin

342N/A if sys.platform == "darwin":

342N/A@@ -268,7 +269,7 @@

342N/A # be assumed that no additional -I,-L directives are needed.

1472N/A lib_dirs = self.compiler.library_dirs + [

1472N/A '/lib64', '/usr/lib64',

1472N/A- '/lib', '/usr/lib',

342N/A+ '/lib', '/usr/lib'

342N/A ]

342N/A inc_dirs = self.compiler.include_dirs + ['/usr/include']

342N/A exts = []

342N/A@@ -452,11 +453,23 @@

342N/A exts.append( Extension('_csv', ['_csv.c']) )

342N/A

342N/A # socket(2)

342N/A+ socket_libs = []

342N/A+ if self.compiler.find_library_file(lib_dirs,

342N/A+ 'socket'):

342N/A+ socket_libs.append('socket')

342N/A+ if self.compiler.find_library_file(lib_dirs,

342N/A+ 'nsl'):

342N/A+ socket_libs.append('nsl')

342N/A+ if self.compiler.find_library_file(lib_dirs,

342N/A+ 'resolv'):

342N/A+ socket_libs.append('resolv')

342N/A exts.append( Extension('_socket', ['socketmodule.c'],

342N/A- depends = ['socketmodule.h']) )

342N/A+ depends = ['socketmodule.h'],

342N/A+ libraries = socket_libs) )

342N/A # Detect SSL support for the socket module (via _ssl)

342N/A ssl_incs = find_file('openssl/ssl.h', inc_dirs,

342N/A- ['/usr/local/ssl/include',

342N/A+ ['/usr/sfw/include',

342N/A+ '/usr/local/ssl/include',

342N/A '/usr/contrib/ssl/include/'

342N/A ]

342N/A )

342N/A@@ -465,8 +478,13 @@

342N/A ['/usr/kerberos/include'])

342N/A if krb5_h:

342N/A ssl_incs += krb5_h

342N/A+ if sys.maxint == 2147483647L:

342N/A+ sfw_libdir = '/usr/sfw/lib';

342N/A+ else:

1311N/A+ sfw_libdir = '/usr/sfw/lib/64';

1311N/A ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,

342N/A- ['/usr/local/ssl/lib',

807N/A+ [sfw_libdir,

807N/A+ '/usr/local/ssl/lib',

807N/A '/usr/contrib/ssl/lib/'

342N/A ] )

342N/A

342N/A@@ -475,6 +493,7 @@

342N/A exts.append( Extension('_ssl', ['_ssl.c'],

342N/A include_dirs = ssl_incs,

342N/A library_dirs = ssl_libs,

342N/A+ runtime_library_dirs = ssl_libs,

342N/A libraries = ['ssl', 'crypto'],

342N/A depends = ['socketmodule.h']), )

342N/A

342N/A@@ -985,15 +1004,25 @@

342N/A

342N/A # Assume we haven't found any of the libraries or include files

342N/A # The versions with dots are used on Unix, and the versions without

342N/A- # dots on Windows, for detection by cygwin.

342N/A+ # dots on Windows, for detection by cygwin.

342N/A+ added_lib_dirs = []

342N/A+ tcl_tk_lib_dirs = ['/usr/sfw/lib']

342N/A+ tcl_tk_inc_dirs = ['/usr/sfw/include']

1394N/A tcllib = tklib = tcl_includes = tk_includes = None

1394N/A for version in ['8.5', '85', '8.4', '84', '8.3', '83', '8.2',

1394N/A '82', '8.1', '81', '8.0', '80']:

1394N/A- tklib = self.compiler.find_library_file(lib_dirs, 'tk' + version)

1394N/A- tcllib = self.compiler.find_library_file(lib_dirs, 'tcl' + version)

342N/A+ tklib = self.compiler.find_library_file(lib_dirs, 'tk' + version, tcl_tk_lib_dirs)

1394N/A+ tcllib = self.compiler.find_library_file(lib_dirs, 'tcl' + version, tcl_tk_lib_dirs)

342N/A if tklib and tcllib:

342N/A # Exit the loop when we've found the Tcl/Tk libraries

342N/A break

342N/A+ tklib = self.compiler.find_library_file(tcl_tk_lib_dirs, 'tk' + version)

1394N/A+ tcllib = self.compiler.find_library_file(tcl_tk_lib_dirs, 'tcl' + version)

342N/A+ if tklib and tcllib:

342N/A+ # found the libs in a non-standard dir

342N/A+ added_lib_dirs.append(os.path.dirname(tcllib))

342N/A+ # Exit the loop when we've found the Tcl/Tk libraries

1394N/A+ break

1394N/A

1394N/A # Now check for the header files

1394N/A if tklib and tcllib:

1394N/A@@ -1009,6 +1038,7 @@

1394N/A for dir in inc_dirs:

1394N/A tcl_include_sub += [dir + os.sep + "tcl" + dotversion]

342N/A tk_include_sub += [dir + os.sep + "tk" + dotversion]

342N/A+ tcl_include_sub += tcl_tk_inc_dirs

342N/A tk_include_sub += tcl_include_sub

342N/A tcl_includes = find_file('tcl.h', inc_dirs, tcl_include_sub)

342N/A tk_includes = find_file('tk.h', inc_dirs, tk_include_sub)

342N/A@@ -1020,7 +1050,7 @@

342N/A

342N/A # OK... everything seems to be present for Tcl/Tk.

342N/A

342N/A- include_dirs = [] ; libs = [] ; defs = [] ; added_lib_dirs = []

342N/A+ include_dirs = [] ; libs = [] ; defs = []

342N/A for dir in tcl_includes + tk_includes:

1394N/A if dir not in include_dirs:

1394N/A include_dirs.append(dir)

1394N/A@@ -1073,6 +1103,7 @@

1394N/A include_dirs = include_dirs,

1394N/A libraries = libs,

1394N/A library_dirs = added_lib_dirs,

1394N/A+ runtime_library_dirs = added_lib_dirs

1394N/A )

342N/A self.extensions.append(ext)

342N/A

545N/A