diff options
| author | Tim Potter <tpot@samba.org> | 2006-05-02 19:00:19 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:05:32 -0500 |
| commit | 0b673b79997365abddac49b51aacfd78b96b7ec2 (patch) | |
| tree | b672468e5565f25d1d81741b57dfe94d653abf63 /source4 | |
| parent | b369ffd1d50a79e0d9d901c3e6d159d9ce1762df (diff) | |
| download | samba-0b673b79997365abddac49b51aacfd78b96b7ec2.tar.gz samba-0b673b79997365abddac49b51aacfd78b96b7ec2.tar.bz2 samba-0b673b79997365abddac49b51aacfd78b96b7ec2.zip | |
r15395: Fix build by adding another copy of the Python detection m4 fragment.
This stuff should be common somewhere.
(This used to be commit e906781cbd7a9d782e028fb0497de739ac6fb797)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/configure.in | 1 | ||||
| -rw-r--r-- | source4/libcli/config.m4 | 31 |
2 files changed, 32 insertions, 0 deletions
diff --git a/source4/configure.in b/source4/configure.in index a392bc8e01..83bc98427a 100644 --- a/source4/configure.in +++ b/source4/configure.in @@ -47,6 +47,7 @@ sinclude(kdc/config.m4) sinclude(ntvfs/sysdep/config.m4) sinclude(lib/appweb/config.m4) sinclude(nsswitch/config.m4) +sinclude(libcli/config.m4) AC_ARG_ENABLE(dso, [ --enable-dso Enable building internal libraries as DSO's (experimental)], diff --git a/source4/libcli/config.m4 b/source4/libcli/config.m4 new file mode 100644 index 0000000000..3327c178c7 --- /dev/null +++ b/source4/libcli/config.m4 @@ -0,0 +1,31 @@ +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_libli_nbt, NO) +fi + +AC_SUBST(PYTHON) |