Author: jelmer Date: 2007-11-21 13:47:39 +0000 (Wed, 21 Nov 2007) New Revision: 26094
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26094 Log: Merge upstream. Added: branches/4.0-python/source/lib/tdb/python.mk branches/4.0-python/source/scripting/python/config.m4 Modified: branches/4.0-python/ branches/4.0-python/.bzrignore branches/4.0-python/source/configure.ac branches/4.0-python/source/lib/tdb/config.mk branches/4.0-python/source/main.mk branches/4.0-python/source/samba4-skip Changeset: Property changes on: branches/4.0-python ___________________________________________________________________ Name: bzr:revision-info ...skipped... Name: bzr:ancestry:v3-trunk0 ...skipped... Name: bzr:file-ids ...skipped... Name: bzr:revision-id:v3-trunk0 ...skipped... Modified: branches/4.0-python/.bzrignore =================================================================== --- branches/4.0-python/.bzrignore 2007-11-21 13:47:35 UTC (rev 26093) +++ branches/4.0-python/.bzrignore 2007-11-21 13:47:39 UTC (rev 26094) @@ -237,5 +237,9 @@ source/librpc/rpc/dcerpc.py source/libcli/swig/libcli_nbt.py source/apidocs +source/lib/tdb/tdb.py +source/lib/tdb/tdb_wrap.c +source/librpc/rpc/dcerpc.py source/scripting/python/misc.py source/scripting/python/misc_wrap.c +source/auth/auth.py Modified: branches/4.0-python/source/configure.ac =================================================================== --- branches/4.0-python/source/configure.ac 2007-11-21 13:47:35 UTC (rev 26093) +++ branches/4.0-python/source/configure.ac 2007-11-21 13:47:39 UTC (rev 26094) @@ -36,8 +36,10 @@ ) SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb >= 1.1.0, - [], [ + SMB_INCLUDE_MK(lib/tdb/python.mk) + ], + [ m4_include(lib/tdb/libtdb.m4) SMB_INCLUDE_MK(lib/tdb/config.mk) ] @@ -78,125 +80,7 @@ m4_include(lib/events/config.m4) dnl m4_include(auth/kerberos/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(scripting/python/config.m4) 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/tdb/config.mk =================================================================== --- branches/4.0-python/source/lib/tdb/config.mk 2007-11-21 13:47:35 UTC (rev 26093) +++ branches/4.0-python/source/lib/tdb/config.mk 2007-11-21 13:47:39 UTC (rev 26094) @@ -57,11 +57,3 @@ LIBTDB # End BINARY tdbbackup ################################################ - -####################### -# Start LIBRARY swig_tdb -[PYTHON::swig_tdb] -SWIG_FILE = tdb.i -PUBLIC_DEPENDENCIES = LIBTDB DYNCONFIG -# End LIBRARY swig_tdb -####################### Added: branches/4.0-python/source/lib/tdb/python.mk =================================================================== --- branches/4.0-python/source/lib/tdb/python.mk 2007-11-21 13:47:35 UTC (rev 26093) +++ branches/4.0-python/source/lib/tdb/python.mk 2007-11-21 13:47:39 UTC (rev 26094) @@ -0,0 +1,3 @@ +[PYTHON::swig_tdb] +SWIG_FILE = tdb.i +PUBLIC_DEPENDENCIES = LIBTDB DYNCONFIG Modified: branches/4.0-python/source/main.mk =================================================================== --- branches/4.0-python/source/main.mk 2007-11-21 13:47:35 UTC (rev 26093) +++ branches/4.0-python/source/main.mk 2007-11-21 13:47:39 UTC (rev 26094) @@ -28,7 +28,6 @@ include librpc/config.mk include client/config.mk include libcli/config.mk -include scripting/ejs/config.mk include scripting/python/config.mk include kdc/config.mk Modified: branches/4.0-python/source/samba4-skip =================================================================== --- branches/4.0-python/source/samba4-skip 2007-11-21 13:47:35 UTC (rev 26093) +++ branches/4.0-python/source/samba4-skip 2007-11-21 13:47:39 UTC (rev 26094) @@ -52,4 +52,3 @@ samba4.ldb.python # Fails to link properly samba4.credentials.python # Fails to link properly samba4.registry.python # Fails to link properly -samba4.tdb.python # Fails to link properly Added: branches/4.0-python/source/scripting/python/config.m4 =================================================================== --- branches/4.0-python/source/scripting/python/config.m4 2007-11-21 13:47:35 UTC (rev 26093) +++ branches/4.0-python/source/scripting/python/config.m4 2007-11-21 13:47:39 UTC (rev 26094) @@ -0,0 +1,117 @@ +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_WARN([No python found]) + SMB_ENABLE(LIBPYTHON,NO) +else + SMB_ENABLE(LIBPYTHON,YES) +fi + +# +# 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])
