[h5py] 372/455: Fixes to setup for Windows

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to annotated tag 1.3.0
in repository h5py.

commit 5bbc29193c6ad37f6bde1890cedc315cca5cb2b1
Author: andrewcollette <andrew.collette at gmail.com>
Date:   Fri Jan 22 08:06:49 2010 +0000

    Fixes to setup for Windows
---
 setup.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/setup.py b/setup.py
index f7f0691..4360793 100644
--- a/setup.py
+++ b/setup.py
@@ -31,14 +31,17 @@ import os.path as op
 
 VERSION = '1.3.0'
 
+try:
+    from setuptools import setup
+    from setuptools.extension import Extension
+except ImportError:
+    from distutils.core import setup, Extension
+    
 from distutils.errors import DistutilsError
-from setuptools.extension import Extension
 from distutils.command.build_ext import build_ext
 from distutils.command.clean import clean
 from distutils.cmd import Command
-
 from distutils.command.build_ext import build_ext
-from setuptools import setup
 import detect
 
 # --- Convenience functions ---------------------------------------------------
@@ -152,7 +155,7 @@ if sys.platform.startswith('win'):
         'libraries'     : ['hdf5dll18'],
         'include_dirs'  : [numpy.get_include(),  localpath('lzf'),
                            localpath('win_include')],
-        'library_dirs'  : [op.join(hdf5, 'dll')],
+        'library_dirs'  : [],
         'define_macros' : [('H5_USE_16_API', None), ('_HDF5USEDLL_', None)]
     }
     if HDF5 is not None:
@@ -357,7 +360,7 @@ class hbuild_ext(build_ext):
         if hdf5 is None:
             autostr = "(path not specified)"
         else:
-            autostr = "(located at %s)" % SETTINGS.hdf5
+            autostr = "(located at %s)" % hdf5
         
         print "Building for HDF5 %s.%s %s" % (api[0], api[1], autostr)
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/h5py.git