svn commit: samba r15395 - in branches/SAMBA_4_0/source: . libcli

[tpot at samba.org]

Author: tpot
Date: 2006-05-02 19:00:19 +0000 (Tue, 02 May 2006)
New Revision: 15395

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15395

Log:
Fix build by adding another copy of the Python detection m4 fragment.  
This stuff should be common somewhere.

Added:
   branches/SAMBA_4_0/source/libcli/config.m4
Modified:
   branches/SAMBA_4_0/source/configure.in


Changeset:
Modified: branches/SAMBA_4_0/source/configure.in
===================================================================
--- branches/SAMBA_4_0/source/configure.in	2006-05-02 13:08:38 UTC (rev 15394)
+++ branches/SAMBA_4_0/source/configure.in	2006-05-02 19:00:19 UTC (rev 15395)
@@ -47,6 +47,7 @@
 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)],

Added: branches/SAMBA_4_0/source/libcli/config.m4
===================================================================
--- branches/SAMBA_4_0/source/libcli/config.m4	2006-05-02 13:08:38 UTC (rev 15394)
+++ branches/SAMBA_4_0/source/libcli/config.m4	2006-05-02 19:00:19 UTC (rev 15395)
@@ -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)