sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

r26100: Also check for SWIG.

Browse Source 
(This used to be commit 1755adffec)
This commit is contained in:
Jelmer Vernooij 2007-11-21 16:04:13 +01:00 committed by Stefan Metzmacher
parent 3950e76a2f
commit c14de3fd89
6 changed files with 5 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.bzrignore
View File

@ -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

1
source4/build/smb_build/makefile.pm
View File

@ -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}

1
source4/configure.ac
View File

@ -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

31
source4/libcli/config.m4
View File

@ -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)

4
source4/scripting/python/config.m4
View File

@ -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

2
source4/scripting/python/config.mk
View File

@ -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"