From a17b5158f1fad6702187afcd1c39684eb4d2ed34 Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Wed, 20 Mar 2002 06:29:23 +0000 Subject: 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) --- source3/python/setup.py.in | 54 ++++++++++++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 21 deletions(-) (limited to 'source3') 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), + ] ) -- cgit