svn commit: samba r26100 - in branches/SAMBA_4_0: . source source/build/smb_build source/libcli source/scripting/python

[jelmer at samba.org]

Author: jelmer
Date: 2007-11-21 16:04:13 +0000 (Wed, 21 Nov 2007)
New Revision: 26100

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

Log:
Also check for SWIG.
Removed:
   branches/SAMBA_4_0/source/libcli/config.m4
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/.bzrignore
   branches/SAMBA_4_0/source/build/smb_build/makefile.pm
   branches/SAMBA_4_0/source/configure.ac
   branches/SAMBA_4_0/source/scripting/python/config.m4
   branches/SAMBA_4_0/source/scripting/python/config.mk


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/.bzrignore
===================================================================
--- branches/SAMBA_4_0/.bzrignore	2007-11-21 15:25:23 UTC (rev 26099)
+++ branches/SAMBA_4_0/.bzrignore	2007-11-21 16:04:13 UTC (rev 26100)
@@ -217,3 +217,4 @@
 source/scripting/python/misc.py
 source/scripting/python/misc_wrap.c
 source/auth/auth.py
+source/lib/registry/tests/proto.h

Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2007-11-21 15:25:23 UTC (rev 26099)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2007-11-21 16:04:13 UTC (rev 26100)
@@ -183,6 +183,7 @@
 
 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}

Modified: branches/SAMBA_4_0/source/configure.ac
===================================================================
--- branches/SAMBA_4_0/source/configure.ac	2007-11-21 15:25:23 UTC (rev 26099)
+++ branches/SAMBA_4_0/source/configure.ac	2007-11-21 16:04:13 UTC (rev 26100)
@@ -92,7 +92,6 @@
 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

Deleted: branches/SAMBA_4_0/source/libcli/config.m4
===================================================================
--- branches/SAMBA_4_0/source/libcli/config.m4	2007-11-21 15:25:23 UTC (rev 26099)
+++ branches/SAMBA_4_0/source/libcli/config.m4	2007-11-21 16:04:13 UTC (rev 26100)
@@ -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)

Modified: branches/SAMBA_4_0/source/scripting/python/config.m4
===================================================================
--- branches/SAMBA_4_0/source/scripting/python/config.m4	2007-11-21 15:25:23 UTC (rev 26099)
+++ branches/SAMBA_4_0/source/scripting/python/config.m4	2007-11-21 16:04:13 UTC (rev 26100)
@@ -3,6 +3,7 @@
 	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 @@
 
 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
-

Modified: branches/SAMBA_4_0/source/scripting/python/config.mk
===================================================================
--- branches/SAMBA_4_0/source/scripting/python/config.mk	2007-11-21 15:25:23 UTC (rev 26099)
+++ branches/SAMBA_4_0/source/scripting/python/config.mk	2007-11-21 16:04:13 UTC (rev 26100)
@@ -20,7 +20,7 @@
 .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"