svn commit: samba r25369 - in branches/4.0-python: . source
source/lib source/lib/ldb source/lib/policy
source/selftest/env source/setup
jelmer at samba.org
jelmer at samba.org
Thu Sep 27 00:42:18 GMT 2007
Author: jelmer
Date: 2007-09-27 00:42:15 +0000 (Thu, 27 Sep 2007)
New Revision: 25369
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25369
Log:
Remove own copy of python.
Removed:
branches/4.0-python/source/lib/python/
Modified:
branches/4.0-python/
branches/4.0-python/source/configure.ac
branches/4.0-python/source/lib/ldb/config.mk
branches/4.0-python/source/lib/policy/lex.c
branches/4.0-python/source/selftest/env/Samba4.pm
branches/4.0-python/source/setup/provision
Changeset:
Property changes on: branches/4.0-python
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:file-ids
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/4.0-python/source/configure.ac
===================================================================
--- branches/4.0-python/source/configure.ac 2007-09-27 00:27:26 UTC (rev 25368)
+++ branches/4.0-python/source/configure.ac 2007-09-27 00:42:15 UTC (rev 25369)
@@ -61,7 +61,124 @@
dnl m4_include(auth/kerberos/config.m4)
-m4_include(lib/python/config.m4)
+AC_ARG_VAR([PYTHON_VERSION],[The installed Python
+ version to use, for example '2.3'. This string
+ will be appended to the Python interpreter
+ canonical name.])
+
+AC_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]])
+if test -z "$PYTHON"; then
+ AC_MSG_ERROR([No python found])
+fi
+
+AC_SUBST(PYTHON)
+
+#
+# Check for a version of Python >= 2.1.0
+#
+AC_MSG_CHECKING([for a version of Python >= '2.1.0'])
+ac_supports_python_ver=`$PYTHON -c "import sys, string; \
+ ver = string.split(sys.version)[[0]]; \
+ print ver >= '2.1.0'"`
+if test "$ac_supports_python_ver" != "True"; then
+ AC_MSG_RESULT([no])
+ AC_MSG_ERROR([No recent version of python found])
+else
+ AC_MSG_RESULT([yes])
+fi
+
+#
+# Check if you have distutils, else fail
+#
+AC_MSG_CHECKING([for the distutils Python package])
+ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
+if test -z "$ac_distutils_result"; then
+ AC_MSG_RESULT([yes])
+else
+ AC_MSG_RESULT([no])
+ AC_MSG_ERROR([distutils not available])
+fi
+
+#
+# Check for Python include path
+#
+AC_MSG_CHECKING([for Python include path])
+if test -z "$PYTHON_CPPFLAGS"; then
+ python_path=`$PYTHON -c "import distutils.sysconfig; \
+ print distutils.sysconfig.get_python_inc();"`
+ if test -n "${python_path}"; then
+ python_path="-I$python_path"
+ fi
+ PYTHON_CPPFLAGS=$python_path
+fi
+AC_MSG_RESULT([$PYTHON_CPPFLAGS])
+AC_SUBST([PYTHON_CPPFLAGS])
+
+#
+# Check for Python library path
+#
+AC_MSG_CHECKING([for Python library path])
+if test -z "$PYTHON_LDFLAGS"; then
+ # (makes two attempts to ensure we've got a version number
+ # from the interpreter)
+ py_version=`$PYTHON -c "from distutils.sysconfig import *; \
+ from string import join; \
+ print join(get_config_vars('VERSION'))"`
+ if test "$py_version" == "[None]"; then
+ if test -n "$PYTHON_VERSION"; then
+ py_version=$PYTHON_VERSION
+ else
+ py_version=`$PYTHON -c "import sys; \
+ print sys.version[[:3]]"`
+ fi
+ fi
+
+ PYTHON_LDFLAGS=`$PYTHON -c "from distutils.sysconfig import *; \
+ from string import join; \
+ print '-L' + get_python_lib(0,1), \
+ '-lpython';"`$py_version
+fi
+AC_MSG_RESULT([$PYTHON_LDFLAGS])
+AC_SUBST([PYTHON_LDFLAGS])
+
+#
+# Check for site packages
+#
+AC_MSG_CHECKING([for Python site-packages path])
+if test -z "$PYTHON_SITE_PKG"; then
+ PYTHON_SITE_PKG=`$PYTHON -c "import distutils.sysconfig; \
+ print distutils.sysconfig.get_python_lib(0,0);"`
+fi
+AC_MSG_RESULT([$PYTHON_SITE_PKG])
+AC_SUBST([PYTHON_SITE_PKG])
+
+#
+# libraries which must be linked in when embedding
+#
+AC_MSG_CHECKING(python extra libraries)
+if test -z "$PYTHON_EXTRA_LIBS"; then
+ PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \
+ conf = distutils.sysconfig.get_config_var; \
+ print conf('LOCALMODLIBS'), conf('LIBS')"`
+fi
+AC_MSG_RESULT([$PYTHON_EXTRA_LIBS])
+AC_SUBST(PYTHON_EXTRA_LIBS)
+
+#
+# linking flags needed when embedding
+#
+AC_MSG_CHECKING(python extra linking flags)
+if test -z "$PYTHON_EXTRA_LDFLAGS"; then
+ PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; \
+ conf = distutils.sysconfig.get_config_var; \
+ print conf('LINKFORSHARED')"`
+fi
+AC_MSG_RESULT([$PYTHON_EXTRA_LDFLAGS])
+AC_SUBST(PYTHON_EXTRA_LDFLAGS)
+
+SMB_EXT_LIB(LIBPYTHON, [$PYTHON_LDFLAGS], [$PYTHON_CPPFLAGS])
+SMB_ENABLE(LIBPYTHON)
+
m4_include(auth/gensec/config.m4)
m4_include(smbd/process_model.m4)
m4_include(ntvfs/posix/config.m4)
Modified: branches/4.0-python/source/lib/ldb/config.mk
===================================================================
--- branches/4.0-python/source/lib/ldb/config.mk 2007-09-27 00:27:26 UTC (rev 25368)
+++ branches/4.0-python/source/lib/ldb/config.mk 2007-09-27 00:42:15 UTC (rev 25369)
@@ -210,7 +210,7 @@
[PYTHON::swig_ldb]
PUBLIC_DEPENDENCIES = LIBLDB DYNCONFIG LIBPYTHON
PRIVATE_DEPENDENCIES = gensec
-LIBRARY_REALNAME = swig/ldb.i
+SWIG_FILE = swig/ldb.i
# End LIBRARY swig_ldb
#######################
Modified: branches/4.0-python/source/lib/policy/lex.c
===================================================================
--- branches/4.0-python/source/lib/policy/lex.c 2007-09-27 00:27:26 UTC (rev 25368)
+++ branches/4.0-python/source/lib/policy/lex.c 2007-09-27 00:42:15 UTC (rev 25369)
@@ -1,6 +1,6 @@
#include "config.h"
-#line 3 "lex.yy.c"
+#line 3 "lib/policy/lex.c"
#define YY_INT_ALIGNED short int
@@ -607,7 +607,7 @@
} \
}
-#line 610 "lex.yy.c"
+#line 610 "lib/policy/lex.c"
#define INITIAL 0
@@ -763,7 +763,7 @@
#line 47 "lex.l"
-#line 766 "lex.yy.c"
+#line 766 "lib/policy/lex.c"
if ( !(yy_init) )
{
@@ -1052,7 +1052,7 @@
#line 102 "lex.l"
ECHO;
YY_BREAK
-#line 1055 "lex.yy.c"
+#line 1055 "lib/policy/lex.c"
case YY_STATE_EOF(INITIAL):
yyterminate();
Modified: branches/4.0-python/source/selftest/env/Samba4.pm
===================================================================
--- branches/4.0-python/source/selftest/env/Samba4.pm 2007-09-27 00:27:26 UTC (rev 25368)
+++ branches/4.0-python/source/selftest/env/Samba4.pm 2007-09-27 00:42:15 UTC (rev 25369)
@@ -408,7 +408,7 @@
(system("($self->{bindir}/testparm $configuration -v --suppress-prompt --parameter-name=\"netbios name\" --section-name=global 2> /dev/null | grep -i \"^$netbiosname\" ) >/dev/null 2>&1") == 0) or die("Failed to create a valid smb.conf configuration!");
-my @provision_options = ("$ENV{PYTHON}", "$self->{setupdir}/provision");
+my @provision_options = ($ENV{PYTHON} or "python", "$self->{setupdir}/provision");
push (@provision_options, split(' ', $configuration));
push (@provision_options, "--host-name=$netbiosname");
push (@provision_options, "--host-ip=$ifaceipv4");
Modified: branches/4.0-python/source/setup/provision
===================================================================
--- branches/4.0-python/source/setup/provision 2007-09-27 00:27:26 UTC (rev 25368)
+++ branches/4.0-python/source/setup/provision 2007-09-27 00:42:15 UTC (rev 25369)
@@ -130,7 +130,7 @@
message("LDAP module: %s on backend: %s\n" % (subobj.LDAPMODULE, subobj.LDAPBACKEND))
if not provision_validate(subobj, message):
- return -1
+ sys.exit(1)
system_session = system_session()
creds = options.get_credentials()
@@ -156,4 +156,3 @@
message("--aci='" + subobj.ACI + "' \\\n")
message("All OK\n")
-return 0
More information about the samba-cvs
mailing list