diff options
| -rw-r--r-- | source3/Makefile.in | 1 | ||||
| -rwxr-xr-x | source3/configure | 4 | ||||
| -rw-r--r-- | source3/configure.in | 2 | ||||
| -rw-r--r-- | source3/python/.cvsignore | 1 | ||||
| -rwxr-xr-x | source3/python/setup.py (renamed from source3/python/setup.py.in) | 14 |
5 files changed, 8 insertions, 14 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 18df73a6da..b8c337f14a 100644 --- a/source3/Makefile.in +++ b/source3/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/source3/configure b/source3/configure index fc2ed311bd..f2b63b75d7 100755 --- a/source3/configure +++ b/source3/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/source3/configure.in b/source3/configure.in index 3a75b32aaf..fd08142bbd 100644 --- a/source3/configure.in +++ b/source3/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/source3/python/.cvsignore b/source3/python/.cvsignore index 8ce381cd39..7e99e367f8 100644 --- a/source3/python/.cvsignore +++ b/source3/python/.cvsignore @@ -1,2 +1 @@ -setup.py *.pyc
\ No newline at end of file diff --git a/source3/python/setup.py.in b/source3/python/setup.py index 5896301245..b39ef448c1 100755 --- a/source3/python/setup.py.in +++ b/source3/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. |