Python's setup.py does not need to be munged by configure.in -- it is

sufficient to just pass the relevant variables to Python from the
Makefile.  Therefore, remove setup.py.in.

diff --git a/source/Makefile.in b/source/Makefile.in
index 18df73a6da371be46e0d98d02f3120fe23a05a77..b8c337f14a7ab94140399e88ef05fa39643ebe16 100644 (file)
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -883,6 +883,7 @@ python_common_proto:
 
 python_ext: $(PYTHON_OBJS)
        PYTHON_OBJS="$(PYTHON_OBJS)" PYTHON_CFLAGS="$(CFLAGS) $(CPPFLAGS)" \
+       LIBS="$(LIBS)" \
                $(PYTHON) python/setup.py build
 
 # revert to the previously installed version

diff --git a/source/configure b/source/configure
index fc2ed311bd786a1e13ee47daf12594f3d404b227..f2b63b75d7f17d8165a30f7f4bbadfe3ecc2cc6a 100755 (executable)
--- a/source/configure
+++ b/source/configure
@@ -14209,7 +14209,7 @@ done
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
-trap 'rm -fr `echo "include/stamp-h Makefile script/findsmb ../examples/VFS/Makefile ../examples/pdb/mysql/Makefile ../examples/pdb/xml/Makefile ../examples/sam/Makefile python/setup.py include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "include/stamp-h Makefile script/findsmb ../examples/VFS/Makefile ../examples/pdb/mysql/Makefile ../examples/pdb/xml/Makefile ../examples/sam/Makefile include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -14345,7 +14345,7 @@ EOF
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"include/stamp-h Makefile script/findsmb ../examples/VFS/Makefile ../examples/pdb/mysql/Makefile ../examples/pdb/xml/Makefile ../examples/sam/Makefile python/setup.py"}
+CONFIG_FILES=\${CONFIG_FILES-"include/stamp-h Makefile script/findsmb ../examples/VFS/Makefile ../examples/pdb/mysql/Makefile ../examples/pdb/xml/Makefile ../examples/sam/Makefile"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then

diff --git a/source/configure.in b/source/configure.in
index 3a75b32aafaf886aa87362749c3b8e7e9b4cae15..fd08142bbdc0016381769242ffa219a30699845b 100644 (file)
--- a/source/configure.in
+++ b/source/configure.in
@@ -2841,7 +2841,7 @@ AC_SUBST(builddir)
 # I added make files that are outside /source directory.
 # I know this is not a good solution, will work out a better
 # solution soon.                       --simo
-AC_OUTPUT(include/stamp-h Makefile script/findsmb ../examples/VFS/Makefile ../examples/pdb/mysql/Makefile ../examples/pdb/xml/Makefile ../examples/sam/Makefile python/setup.py)
+AC_OUTPUT(include/stamp-h Makefile script/findsmb ../examples/VFS/Makefile ../examples/pdb/mysql/Makefile ../examples/pdb/xml/Makefile ../examples/sam/Makefile)
 
 #################################################
 # Print very concise instructions on building/use

diff --git a/source/python/.cvsignore b/source/python/.cvsignore
index 8ce381cd39f929b44122bc43cb97076b7e1585b1..7e99e367f8443d86e5e8825b9fda39dfbb39630d 100644 (file)
--- a/source/python/.cvsignore
+++ b/source/python/.cvsignore
@@ -1,2 +1 @@
-setup.py
 *.pyc
\ No newline at end of file

diff --git a/source/python/setup.py.in b/source/python/setup.py
similarity index 94%
rename from source/python/setup.py.in
rename to source/python/setup.py
index 5896301245844ade48d99d17413fd417b76dbc40..b39ef448c1adc814502c67009bc1c74b3b933071 100755 (executable)
--- a/source/python/setup.py.in
+++ b/source/python/setup.py
@@ -30,21 +30,15 @@ import sys, string, os
 # method of adding setup commands and will also confuse people who are
 # familiar with the python Distutils module.
 
-samba_objs = ""
-if os.environ.has_key("PYTHON_OBJS"):
-    samba_objs = os.environ.get("PYTHON_OBJS")
+samba_objs = os.environ.get("PYTHON_OBJS", "")
 
-samba_cflags = ""
-if os.environ.has_key("PYTHON_CFLAGS"):
-    samba_cflags = os.environ.get("PYTHON_CFLAGS")
+samba_cflags = os.environ.get("PYTHON_CFLAGS", "")
 
-samba_srcdir = ""
-if os.environ.has_key("SRCDIR"):
-    samba_srcdir = os.environ.get("SRCDIR")
+samba_srcdir = os.environ.get("SRCDIR", "")
 
 # These variables are filled in by configure
 
-samba_libs = "@LIBS@"
+samba_libs = os.environ.get("LIBS", "")
 
 # Convert libs and objs from space separated strings to lists of strings
 # for distutils to digest.  Split "-l" prefix off library list.