sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-02 00:22:11 +03:00
Code Activity

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

Browse Source 
sufficient to just pass the relevant variables to Python from the
Makefile.  Therefore, remove setup.py.in.
This commit is contained in:
Martin Pool
-
parent c45364ae82
commit 8bebe9ee2b
5 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/Makefile.in
View File

@ -883,6 +883,7 @@ python_common_proto:
python_ext: $(PYTHON_OBJS) python_ext: $(PYTHON_OBJS)
PYTHON_OBJS="$(PYTHON_OBJS)" PYTHON_CFLAGS="$(CFLAGS) $(CPPFLAGS)" \ PYTHON_OBJS="$(PYTHON_OBJS)" PYTHON_CFLAGS="$(CFLAGS) $(CPPFLAGS)" \
LIBS="$(LIBS)" \
$(PYTHON) python/setup.py build $(PYTHON) python/setup.py build
# revert to the previously installed version # revert to the previously installed version

4
source/configure vendored
View File

@ -14209,7 +14209,7 @@ done
ac_given_srcdir=$srcdir ac_given_srcdir=$srcdir
ac_given_INSTALL="$INSTALL" 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 EOF
cat >> $CONFIG_STATUS <<EOF cat >> $CONFIG_STATUS <<EOF
@ -14345,7 +14345,7 @@ EOF
cat >> $CONFIG_STATUS <<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 EOF
cat >> $CONFIG_STATUS <<\EOF cat >> $CONFIG_STATUS <<\EOF
for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then

2
source/configure.in
View File

@ -2841,7 +2841,7 @@ AC_SUBST(builddir)
# I added make files that are outside /source directory. # I added make files that are outside /source directory.
# I know this is not a good solution, will work out a better # I know this is not a good solution, will work out a better
# solution soon. --simo # 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 # Print very concise instructions on building/use

1
source/python/.cvsignore
View File

@ -1,2 +1 @@
setup.py
*.pyc *.pyc

14
source/python/setup.py.in → source/python/setup.py
View File

@ -30,21 +30,15 @@ import sys, string, os
# method of adding setup commands and will also confuse people who are # method of adding setup commands and will also confuse people who are
# familiar with the python Distutils module. # familiar with the python Distutils module.
samba_objs = "" samba_objs = os.environ.get("PYTHON_OBJS", "")
if os.environ.has_key("PYTHON_OBJS"):
samba_objs = os.environ.get("PYTHON_OBJS")
samba_cflags = "" samba_cflags = os.environ.get("PYTHON_CFLAGS", "")
if os.environ.has_key("PYTHON_CFLAGS"):
samba_cflags = os.environ.get("PYTHON_CFLAGS")
samba_srcdir = "" samba_srcdir = os.environ.get("SRCDIR", "")
if os.environ.has_key("SRCDIR"):
samba_srcdir = os.environ.get("SRCDIR")
# These variables are filled in by configure # 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 # Convert libs and objs from space separated strings to lists of strings
# for distutils to digest. Split "-l" prefix off library list. # for distutils to digest. Split "-l" prefix off library list.