[SCM] Samba Shared Repository - branch v3-6-test updated

[Stefan Metzmacher]

The branch, v3-6-test has been updated
       via  3007c98 m4: Don't AC_MSG_ERROR when too old python is found
      from  9243c4e s3-docs: Typos in rpcclient man page

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 3007c98c5e917c924539d41a4946adbca2ed48f4
Author: Volker Lendecke <v...@samba.org>
Date:   Mon Jan 10 10:06:37 2011 +0100

    m4: Don't AC_MSG_ERROR when too old python is found
    
    This broke the pure S3 build with an old python
    
    Matthias Dieter Wallnöfer, please check!
    
    Autobuild-User: Volker Lendecke <vlen...@samba.org>
    Autobuild-Date: Mon Jan 10 11:26:18 CET 2011 on sn-devel-104
    (cherry picked from commit 1c6d89660ea6687df55248e1f45699e59562792a)
    
    Signed-off-by: Stefan Metzmacher <me...@samba.org>

-----------------------------------------------------------------------

Summary of changes:
 m4/check_python.m4 |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/m4/check_python.m4 b/m4/check_python.m4
index 8ca0ead..9d0524a 100644
--- a/m4/check_python.m4
+++ b/m4/check_python.m4
@@ -76,11 +76,6 @@ AC_DEFUN([AC_SAMBA_PYTHON_DEVEL],
 
        if test x$PYTHON != x
        then
-               if `$PYTHON -c "import sys; 
sys.exit(sys.version_info.__getslice__(0, 2) >= (2, 4))"`
-               then
-                       AC_MSG_ERROR([Python ($PYTHON) is too old. At least 
version 2.4 is required])
-               fi
-
                DISTUTILS_CFLAGS=`$PYTHON -c "from distutils import sysconfig; \
                                              print '-I%s -I%s %s' % ( \
                                                        
sysconfig.get_python_inc(), \
@@ -95,6 +90,12 @@ AC_DEFUN([AC_SAMBA_PYTHON_DEVEL],
                                                        
sysconfig.get_config_var('LDFLAGS'), \
                                                        
sysconfig.get_config_var('LIBPL'))"`
                TRY_LINK_PYTHON($DISTUTILS_LDFLAGS, $DISTUTILS_CFLAGS)
+
+               if `$PYTHON -c "import sys; 
sys.exit(sys.version_info.__getslice__(0, 2) >= (2, 4))"`
+               then
+                       AC_MSG_WARN([Python ($PYTHON) is too old. At least 
version 2.4 is required])
+                       working_python=no
+               fi
        fi
 
        AC_MSG_CHECKING(working python module support)


-- 
Samba Shared Repository