← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to setup.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-06-11 02:29:14 UTC
  • mfrom: (4428.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090611022914-p9nxmjfongc8w3va
(mbp) merge zdll setup.py fix from 1.15

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
261
261
 
262
262
add_pyrex_extension('bzrlib._bencode_pyx')
263
263
add_pyrex_extension('bzrlib._btree_serializer_c')
264
 
add_pyrex_extension('bzrlib._chk_map_pyx', libraries=['z'])
265
264
add_pyrex_extension('bzrlib._chunks_to_lines_pyx')
266
265
add_pyrex_extension('bzrlib._groupcompress_pyx',
267
266
                    extra_source=['bzrlib/diff-delta.c'])
271
270
    add_pyrex_extension('bzrlib._dirstate_helpers_c',
272
271
                        libraries=['Ws2_32'])
273
272
    add_pyrex_extension('bzrlib._walkdirs_win32')
 
273
    z_lib = 'zdll'
274
274
else:
275
275
    if have_pyrex and pyrex_version == '0.9.4.1':
276
276
        # Pyrex 0.9.4.1 fails to compile this extension correctly
285
285
    else:
286
286
        add_pyrex_extension('bzrlib._dirstate_helpers_c')
287
287
    add_pyrex_extension('bzrlib._readdir_pyx')
 
288
    z_lib = 'z'
 
289
add_pyrex_extension('bzrlib._chk_map_pyx', libraries=[z_lib])
288
290
ext_modules.append(Extension('bzrlib._patiencediff_c', ['bzrlib/_patiencediff_c.c']))
289
291
 
290
292