Remove extra 'w' from canonical strings for 'write' and 'all

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

diff --git a/setup.py b/setup.py
index 187733a..0a59340 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -17,16 +17,22 @@ include_dirs = [os.path.join(os.path.dirname(__file__), 'afs'),
                 '%s/include' % root]
 library_dirs = ['%s/lib' % root,
                 '%s/lib/afs' % root]
-libraries = ['afsauthent', 'afsrpc', '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)]
 
-def PyAFSExtension(module):
+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('.', '/')],
-                     libraries=libraries,
-                     include_dirs=include_dirs,
-                     library_dirs=library_dirs,
-                     define_macros=define_macros)
+                     *args,
+                     **kwargs)
 
 setup(
     name="PyAFS",