Correct documention

[invirt/packages/python-afs.git] / setup.py

diff --git a/setup.py b/setup.py
index 977deb5..1f28113 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
 #!/usr/bin/python
 

-from setuptools import setup, find_packages
+from distutils.core import setup

 from distutils.extension import Extension
 from Cython.Distutils import build_ext
 import sys
 from distutils.extension import Extension
 from Cython.Distutils import build_ext
 import sys

@@ -17,31 +17,38 @@ include_dirs = [os.path.join(os.path.dirname(__file__), 'afs'),
                 '%s/include' % root]
 library_dirs = ['%s/lib' % root,
                 '%s/lib/afs' % root]
                 '%s/include' % root]
 library_dirs = ['%s/lib' % root,
                 '%s/lib/afs' % root]

-libraries = ['afsauthent', 'afsrpc', 'afsutil', 'resolv']
+if os.path.exists('%s/lib/libafsauthent_pic.a' % root):
+    suffix = '_pic'
+else:
+    suffix = ''
+libraries = ['afsauthent%s' % suffix, 'afsrpc%s' % suffix, 'resolv']

 define_macros = [('AFS_PTHREAD_ENV', None)]
 
 define_macros = [('AFS_PTHREAD_ENV', None)]
 

+def PyAFSExtension(module, *args, **kwargs):
+    kwargs.setdefault('libraries', []).extend(libraries)
+    kwargs.setdefault('include_dirs', []).extend(include_dirs)
+    kwargs.setdefault('library_dirs', []).extend(library_dirs)
+    kwargs.setdefault('define_macros', []).extend(define_macros)
+    return Extension(module,
+                     ["%s.pyx" % module.replace('.', '/')],
+                     *args,
+                     **kwargs)
+

 setup(
     name="PyAFS",
 setup(
     name="PyAFS",

-    version="0.0.0",
+    version="0.1.1",

     description="PyAFS - Python bindings for AFS",
     author="Evan Broder",
     author_email="broder@mit.edu",
     description="PyAFS - Python bindings for AFS",
     author="Evan Broder",
     author_email="broder@mit.edu",

+    url="http://github.com/ebroder/pyafs/",

     license="GPL",
     requires=['Cython'],
     license="GPL",
     requires=['Cython'],

-    packages=find_packages(),
+    packages=['afs', 'afs.tests'],

     ext_modules=[
     ext_modules=[

-        Extension("afs._pts",
-                  ["afs/_pts.pyx"],
-                  libraries=libraries,
-                  include_dirs=include_dirs,
-                  library_dirs=library_dirs,
-                  define_macros=define_macros),
-        Extension("afs.afs",
-                  ["afs/afs.pyx"],
-                  libraries=libraries,
-                  include_dirs=include_dirs,
-                  library_dirs=library_dirs,
-                  define_macros=define_macros)
+        PyAFSExtension("afs._util"),
+        PyAFSExtension("afs._acl"),
+        PyAFSExtension("afs._fs"),
+        PyAFSExtension("afs._pts", libraries=['krb5']),

         ],
     cmdclass= {"build_ext": build_ext}
 )
         ],
     cmdclass= {"build_ext": build_ext}
 )