[scikit-learn] 01/04: Use system-wide libsvm library instead of shipped one

[Andreas Tille]

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

tille pushed a commit to annotated tag debian/0.2+svn625-1
in repository scikit-learn.

commit 2741130488d0ba53b9226dcd60bd4178cdfd446d
Author: Yaroslav Halchenko <debian at onerussian.com>
Date:   Wed Apr 7 23:25:56 2010 -0400

    Use system-wide libsvm library instead of shipped one
---
 scikits/learn/setup.py | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/scikits/learn/setup.py b/scikits/learn/setup.py
index 7092e89..330a380 100644
--- a/scikits/learn/setup.py
+++ b/scikits/learn/setup.py
@@ -1,4 +1,4 @@
-from os.path import join
+from os.path import join, dirname
 import numpy
 
 # Workaround to enforce building cython extensions while
@@ -21,16 +21,22 @@ def configuration(parent_package='',top_path=None):
     config.add_subpackage('glm')
     config.add_subpackage('manifold')
     config.add_subpackage('utils')
+
+    include_dirs = []
+    if top_path != '':
+         # so that top-level setup.py could build
+        include_dirs += [join(dirname(__file__), 'src')]
+
     config.add_extension('libsvm',
                          define_macros=[('LIBSVM_EXPORTS', None),
                                         ('LIBSVM_DLL',     None)],
-                         sources=[join('src', 'svm.cpp'), 
-                                  join('src', 'libsvm.pyx'),
+                         sources=[join('src', 'libsvm.pyx'),
                                   ],
-                         include_dirs=[numpy.get_include(),
-                                       join('scikits', 'learn', 'src')],
-                         depends=[join('src', 'svm.h'),
-                                 join('src', 'libsvm_helper.c'),
+                         include_dirs=['/usr/include/libsvm-2.0/libsvm']
+                                      + include_dirs,
+                                      # [numpy.get_include()] +
+                         libraries=['svm'],
+                         depends=[join('src', 'libsvm_helper.c'),
                                   ])
 
     config.add_extension('BallTree',

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