summaryrefslogtreecommitdiff
path: root/source4/scripting/python
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-11-21 16:04:13 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:46:03 +0100
commitc14de3fd893c4a44cf35c2b354e51bf7f4a81992 (patch)
treeadc9fded6bb9069342b61932761b6eb7e529cb9c /source4/scripting/python
parent3950e76a2f2a33f726ea4a798e603d6af53e8069 (diff)
downloadsamba-c14de3fd893c4a44cf35c2b354e51bf7f4a81992.tar.gz
samba-c14de3fd893c4a44cf35c2b354e51bf7f4a81992.tar.bz2
samba-c14de3fd893c4a44cf35c2b354e51bf7f4a81992.zip
r26100: Also check for SWIG.
(This used to be commit 1755adffecb8ed68047d6ad69087a680cc63ba8f)
Diffstat (limited to 'source4/scripting/python')
-rw-r--r--source4/scripting/python/config.m44
-rw-r--r--source4/scripting/python/config.mk2
2 files changed, 3 insertions, 3 deletions
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"