diff options
| -rw-r--r-- | .bzrignore | 1 | ||||
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 1 | ||||
| -rw-r--r-- | source4/configure.ac | 1 | ||||
| -rw-r--r-- | source4/libcli/config.m4 | 31 | ||||
| -rw-r--r-- | source4/scripting/python/config.m4 | 4 | ||||
| -rw-r--r-- | source4/scripting/python/config.mk | 2 |
6 files changed, 5 insertions, 35 deletions
diff --git a/.bzrignore b/.bzrignore index 1dca07b6c7..71fff6bb38 100644 --- a/.bzrignore +++ b/.bzrignore @@ -217,3 +217,4 @@ source/librpc/rpc/dcerpc.py source/scripting/python/misc.py source/scripting/python/misc_wrap.c source/auth/auth.py +source/lib/registry/tests/proto.h diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index cd73aeb8a7..954c476f33 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -183,6 +183,7 @@ SHELL=$self->{config}->{SHELL} PERL=$self->{config}->{PERL} PYTHON=$self->{config}->{PYTHON} +SWIG=$self->{config}->{SWIG} CPP=$self->{config}->{CPP} CPPFLAGS=$builddir_headers-I\$(srcdir)/include -I\$(srcdir) -I\$(srcdir)/lib -I\$(srcdir)/lib/replace -I\$(srcdir)/lib/talloc -D_SAMBA_BUILD_=4 -DHAVE_CONFIG_H $self->{config}->{CPPFLAGS} diff --git a/source4/configure.ac b/source4/configure.ac index f4fb671aed..0163940bc0 100644 --- a/source4/configure.ac +++ b/source4/configure.ac @@ -92,7 +92,6 @@ m4_include(kdc/config.m4) m4_include(ntvfs/sysdep/config.m4) m4_include(lib/appweb/config.m4) m4_include(nsswitch/config.m4) -m4_include(libcli/config.m4) ################################################# # add *_CFLAGS only for the real build diff --git a/source4/libcli/config.m4 b/source4/libcli/config.m4 deleted file mode 100644 index e31359fdaa..0000000000 --- a/source4/libcli/config.m4 +++ /dev/null @@ -1,31 +0,0 @@ -AC_MSG_CHECKING([for Python (libcli_nbt)]) - -PYTHON= - -AC_ARG_WITH(python, -[ --with-python=PYTHONNAME build Python libraries], -[ case "${withval-python}" in - yes) - PYTHON=python - ;; - no) - PYTHON= - ;; - *) - PYTHON=${withval-python} - ;; - esac ]) - -if test x"$PYTHON" != "x"; then - incdir=`python -c 'import sys; print "%s/include/python%d.%d" % (sys.prefix, sys.version_info[[0]], sys.version_info[[1]])'` - CPPFLAGS="$CPPFLAGS -I $incdir" -fi - -if test x"$PYTHON" != "x"; then - AC_MSG_RESULT([${withval-python}]) -else - AC_MSG_RESULT(no) - SMB_ENABLE(swig_libcli_nbt, NO) -fi - -AC_SUBST(PYTHON) diff --git a/source4/scripting/python/config.m4 b/source4/scripting/python/config.m4 index 0b5e174590..48103a0782 100644 --- a/source4/scripting/python/config.m4 +++ b/source4/scripting/python/config.m4 @@ -3,6 +3,7 @@ AC_ARG_VAR([PYTHON_VERSION],[The installed Python will be appended to the Python interpreter canonical name.]) +AC_PATH_PROG(SWIG,swig,no) AC_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]]) if test -z "$PYTHON"; then working_python=no @@ -115,10 +116,9 @@ AC_SUBST(PYTHON_EXTRA_LDFLAGS) SMB_EXT_LIB(LIBPYTHON, [$PYTHON_LDFLAGS], [$PYTHON_CPPFLAGS]) -if test x$working_python = xyes +if test x$working_python = xyes && test x$SWIG != xno then SMB_ENABLE(LIBPYTHON,YES) else SMB_ENABLE(LIBPYTHON,NO) fi - diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk index b70d98d908..c176077267 100644 --- a/source4/scripting/python/config.mk +++ b/source4/scripting/python/config.mk @@ -20,7 +20,7 @@ swig: pythonmods .SUFFIXES: _wrap.c .i .i_wrap.c: - swig -Wall -I$(srcdir)/scripting/swig -python $< + $(SWIG) -Wall -I$(srcdir)/scripting/swig -python $< clean:: @echo "Removing SWIG output files" |