summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2002-03-20 06:29:23 +0000
committerTim Potter <tpot@samba.org>2002-03-20 06:29:23 +0000
commita17b5158f1fad6702187afcd1c39684eb4d2ed34 (patch)
tree1db6d388a74d39b421dce143bbe877cf2a169c80 /source3
parent747e020a07391f7529036ce2e65d46724a56bb70 (diff)
downloadsamba-a17b5158f1fad6702187afcd1c39684eb4d2ed34.tar.gz
samba-a17b5158f1fad6702187afcd1c39684eb4d2ed34.tar.bz2
samba-a17b5158f1fad6702187afcd1c39684eb4d2ed34.zip
Actually use flags passed in PYTHON_CFLAGS variable.
Use py_common.c in winbind extension module for correct initialisation. Some reformatting. (This used to be commit b1b7ae8bcfafc92c2d475908f4220f3f1ff941a1)
Diffstat (limited to 'source3')
-rwxr-xr-xsource3/python/setup.py.in54
1 files changed, 33 insertions, 21 deletions
diff --git a/source3/python/setup.py.in b/source3/python/setup.py.in
index ce29bcc37f..23a7cba57d 100755
--- a/source3/python/setup.py.in
+++ b/source3/python/setup.py.in
@@ -38,8 +38,6 @@ samba_cflags = ""
if os.environ.has_key("PYTHON_CFLAGS"):
samba_cflags = os.environ.get("PYTHON_CFLAGS")
-print "FLAGS =", samba_cflags
-
# These variables are filled in by configure
samba_libs = "@LIBS@"
@@ -54,6 +52,8 @@ lib_list = []
for lib in string.split(samba_libs):
lib_list.append(string.replace(lib, "-l", ""))
+flags_list = string.split(samba_cflags)
+
# Invoke distutils.setup
setup(
@@ -73,23 +73,35 @@ setup(
# Module list
- ext_modules = [Extension(name = "spoolss",
- sources = ["python/py_spoolss.c",
- "python/py_spoolss_forms.c",
- "python/py_common.c"],
- libraries = lib_list,
- library_dirs = ["/usr/kerberos/lib"],
- extra_objects = obj_list),
- Extension(name = "lsa",
- sources = ["python/py_lsa.c",
- "python/py_common.c"],
- libraries = lib_list,
- library_dirs = ["/usr/kerberos/lib"],
- extra_objects = obj_list),
- Extension(name = "winbind",
- sources = ["python/py_winbind.c"],
- libraries = lib_list,
- library_dirs = ["/usr/kerberos/lib"],
- extra_objects = obj_list),
- ]
+ ext_modules = [
+
+ # SPOOLSS pipe module
+
+ Extension(name = "spoolss",
+ sources = ["python/py_spoolss.c",
+ "python/py_spoolss_forms.c",
+ "python/py_common.c"],
+ libraries = lib_list,
+ library_dirs = ["/usr/kerberos/lib"],
+ extra_objects = obj_list),
+
+ # LSA pipe module
+
+ Extension(name = "lsa",
+ sources = ["python/py_lsa.c",
+ "python/py_common.c"],
+ libraries = lib_list,
+ library_dirs = ["/usr/kerberos/lib"],
+ extra_objects = obj_list),
+
+ # winbind client module
+
+ Extension(name = "winbind",
+ sources = ["python/py_winbind.c",
+ "python/py_common.c"],
+ libraries = lib_list,
+ library_dirs = ["/usr/kerberos/lib"],
+ extra_objects = obj_list,
+ extra_compile_args = flags_list),
+ ]
)