svn commit: samba r26098 - in branches/SAMBA_4_0: . source/scripting/python

[jelmer at samba.org]

Author: jelmer
Date: 2007-11-21 15:19:51 +0000 (Wed, 21 Nov 2007)
New Revision: 26098

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

Log:
Make missing python no longer fatal.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/scripting/python/config.m4


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/source/scripting/python/config.m4
===================================================================
--- branches/SAMBA_4_0/source/scripting/python/config.m4	2007-11-21 14:49:35 UTC (rev 26097)
+++ branches/SAMBA_4_0/source/scripting/python/config.m4	2007-11-21 15:19:51 UTC (rev 26098)
@@ -5,10 +5,8 @@
 
 AC_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]])
 if test -z "$PYTHON"; then
+	working_python=no
 	AC_MSG_WARN([No python found])
-	SMB_ENABLE(LIBPYTHON,NO)
-else
-	SMB_ENABLE(LIBPYTHON,YES)
 fi
 
 #
@@ -19,8 +17,8 @@
 	ver = string.split(sys.version)[[0]]; \
 	print ver >= '2.1.0'"`
 if test "$ac_supports_python_ver" != "True"; then
+	working_python=no
 	AC_MSG_RESULT([no])
-	AC_MSG_ERROR([No recent version of python found])
 else 
 	AC_MSG_RESULT([yes])
 fi
@@ -32,9 +30,10 @@
 ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
 if test -z "$ac_distutils_result"; then
 	AC_MSG_RESULT([yes])
+	working_python=yes
 else
 	AC_MSG_RESULT([no])
-	AC_MSG_ERROR([distutils not available])
+	working_python=no
 fi
 
 #
@@ -115,3 +114,11 @@
 AC_SUBST(PYTHON_EXTRA_LDFLAGS)
 
 SMB_EXT_LIB(LIBPYTHON, [$PYTHON_LDFLAGS], [$PYTHON_CPPFLAGS])
+
+if test x$working_python = xyes
+then
+	SMB_ENABLE(LIBPYTHON,YES)
+else
+	SMB_ENABLE(LIBPYTHON,NO)
+fi
+