summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2011-01-10 10:06:37 +0100
committerVolker Lendecke <vlendec@samba.org>2011-01-10 11:26:18 +0100
commit1c6d89660ea6687df55248e1f45699e59562792a (patch)
tree180c98780ef922da82c9a5062e4d8bafd55c93c3
parent504be0ac548bf422e303aca645aeaad12b6de6df (diff)
downloadsamba-1c6d89660ea6687df55248e1f45699e59562792a.tar.gz
samba-1c6d89660ea6687df55248e1f45699e59562792a.tar.bz2
samba-1c6d89660ea6687df55248e1f45699e59562792a.zip
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 <vlendec@samba.org> Autobuild-Date: Mon Jan 10 11:26:18 CET 2011 on sn-devel-104
-rw-r--r--m4/check_python.m411
1 files changed, 6 insertions, 5 deletions
diff --git a/m4/check_python.m4 b/m4/check_python.m4
index 8ca0ead189..9d0524a8e8 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)