[SCM] Samba Shared Repository - branch master updated -
release-4-0-0alpha7-379-g05a9d02
Jelmer Vernooij
jelmer at samba.org
Sun Mar 15 16:03:03 GMT 2009
The branch, master has been updated
via 05a9d0266f9da163b84b830532fb9755a19874da (commit)
via 693221cfdff655dd78199c9d25a47db8783160a9 (commit)
via 0ea702efaeaadcdcb05e99e838dae1b2dbdd95b9 (commit)
via 8edd73759de2faf139d22fc1eec04192375449ae (commit)
via 75783473d180661257e3f0e3d300179caf34bd8e (commit)
from c223beee2a0bd6922eda4551caec0061c86097f2 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 05a9d0266f9da163b84b830532fb9755a19874da
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Mar 15 17:02:08 2009 +0100
python: Always run with the same version of Python as we build against.
commit 693221cfdff655dd78199c9d25a47db8783160a9
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Mar 15 16:49:12 2009 +0100
Fix installation of tdr.h.
commit 0ea702efaeaadcdcb05e99e838dae1b2dbdd95b9
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Mar 15 16:35:13 2009 +0100
configure: Add common file with minimum versions of external libraries.
commit 8edd73759de2faf139d22fc1eec04192375449ae
Merge: c223beee2a0bd6922eda4551caec0061c86097f2 75783473d180661257e3f0e3d300179caf34bd8e
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Mar 15 15:39:15 2009 +0100
Merge branch 'nodiscard' of /home/jelmer/samba4
commit 75783473d180661257e3f0e3d300179caf34bd8e
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Mar 15 03:05:46 2009 +0100
Remove unused CONST_DISCARD macro.
-----------------------------------------------------------------------
Summary of changes:
m4/check_python.m4 | 6 +++++-
source3/samba4.m4 | 10 ++++++----
source4/configure.ac | 10 ++++++----
source4/headermap.txt | 2 +-
source4/include/includes.h | 4 ----
source4/min_versions.m4 | 6 ++++++
6 files changed, 24 insertions(+), 14 deletions(-)
create mode 100644 source4/min_versions.m4
Changeset truncated at 500 lines:
diff --git a/m4/check_python.m4 b/m4/check_python.m4
index 7e56af7..9453766 100644
--- a/m4/check_python.m4
+++ b/m4/check_python.m4
@@ -41,7 +41,11 @@ dnl $PYTHON_CFLAGS
dnl $PYTHON_LDFLAGS
AC_DEFUN([AC_SAMBA_PYTHON_DEVEL],
[
- AC_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]])
+ if test -z "$PYTHON_VERSION"; then
+ AC_PATH_PROGS([PYTHON], [python2.6 python2.5 python2.4 python])
+ else
+ AC_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]])
+ fi
if test -z "$PYTHON"; then
working_python=no
AC_MSG_WARN([No python found])
diff --git a/source3/samba4.m4 b/source3/samba4.m4
index 897a9b8..b5c7c74 100644
--- a/source3/samba4.m4
+++ b/source3/samba4.m4
@@ -67,14 +67,16 @@ AC_CONFIG_FILES(../source4/param/samba-hostconfig.pc)
AC_CONFIG_FILES(../source4/librpc/dcerpc_samr.pc)
AC_CONFIG_FILES(../source4/librpc/dcerpc_atsvc.pc)
-SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= 1.3.0,
+m4_include(../source4/min_versions.m4)
+
+SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= $TALLOC_MIN_VERSION,
[],
[
SMB_INCLUDE_MK(../lib/talloc/config.mk)
]
)
-SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb >= 1.1.3,
+SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb >= $TDB_MIN_VERSION,
[],
[
m4_include(../lib/tdb/libtdb.m4)
@@ -84,13 +86,13 @@ SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb >= 1.1.3,
SMB_INCLUDE_MK(../lib/tdb/python.mk)
-SMB_EXT_LIB_FROM_PKGCONFIG(LIBTEVENT, tevent = 0.9.4,
+SMB_EXT_LIB_FROM_PKGCONFIG(LIBTEVENT, tevent = $TEVENT_REQUIRED_VERSION,
[],[m4_include(../lib/tevent/samba.m4)]
)
SMB_INCLUDE_MK(../lib/tevent/python.mk)
-SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb = 0.9.3,
+SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb = $LDB_REQUIRED_VERSION,
[
SMB_INCLUDE_MK(lib/ldb/ldb_ildap/config.mk)
SMB_INCLUDE_MK(lib/ldb/tools/config.mk)
diff --git a/source4/configure.ac b/source4/configure.ac
index a1eb4f4..065a330 100644
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -42,14 +42,16 @@ AC_CONFIG_FILES(param/samba-hostconfig.pc)
AC_CONFIG_FILES(librpc/dcerpc_samr.pc)
AC_CONFIG_FILES(librpc/dcerpc_atsvc.pc)
-SMB_INCLUDED_LIB_PKGCONFIG(LIBTALLOC, talloc >= 1.3.0, [],
+m4_include(min_versions.m4)
+
+SMB_INCLUDED_LIB_PKGCONFIG(LIBTALLOC, talloc >= $TALLOC_MIN_VERSION, [],
[
m4_include(../lib/talloc/libtalloc.m4)
SMB_INCLUDE_MK(../lib/talloc/config.mk)
]
)
-SMB_INCLUDED_LIB_PKGCONFIG(LIBTDB, tdb >= 1.1.3,
+SMB_INCLUDED_LIB_PKGCONFIG(LIBTDB, tdb >= $TDB_MIN_VERSION,
[],
[
m4_include(../lib/tdb/libtdb.m4)
@@ -59,13 +61,13 @@ SMB_INCLUDED_LIB_PKGCONFIG(LIBTDB, tdb >= 1.1.3,
SMB_INCLUDE_MK(../lib/tdb/python.mk)
-SMB_INCLUDED_LIB_PKGCONFIG(LIBTEVENT, tevent = 0.9.4,
+SMB_INCLUDED_LIB_PKGCONFIG(LIBTEVENT, tevent = TEVENT_REQUIRED_VERSION,
[],[m4_include(../lib/tevent/samba.m4)]
)
SMB_INCLUDE_MK(../lib/tevent/python.mk)
-SMB_INCLUDED_LIB_PKGCONFIG(LIBLDB, ldb = 0.9.3,
+SMB_INCLUDED_LIB_PKGCONFIG(LIBLDB, ldb = $LDB_REQUIRED_VERSION,
[
SMB_INCLUDE_MK(lib/ldb/ldb_ildap/config.mk)
SMB_INCLUDE_MK(lib/ldb/tools/config.mk)
diff --git a/source4/headermap.txt b/source4/headermap.txt
index 8287044..9de5b1c 100644
--- a/source4/headermap.txt
+++ b/source4/headermap.txt
@@ -9,7 +9,7 @@
../lib/util/memory.h: util/memory.h
../lib/util/talloc_stack.h: util/talloc_stack.h
../lib/util/xfile.h: util/xfile.h
-lib/tdr/tdr.h: tdr.h
+../lib/tdr/tdr.h: tdr.h
librpc/rpc/dcerpc.h: dcerpc.h
lib/ldb/include/ldb.h: ldb.h
lib/ldb/include/ldb_errors.h: ldb_errors.h
diff --git a/source4/include/includes.h b/source4/include/includes.h
index ddda21f..d9b7759 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -64,10 +64,6 @@
/* String routines */
#include "../lib/util/safe_string.h"
-#ifndef CONST_DISCARD
-#define CONST_DISCARD(type, ptr) ((type) ((void *) (ptr)))
-#endif
-
#if 0
/* darn, we can't do this now that we don't link the ldb tools to all the smb libs */
#define TALLOC_ABORT(reason) smb_panic(reason)
diff --git a/source4/min_versions.m4 b/source4/min_versions.m4
new file mode 100644
index 0000000..46f45a1
--- /dev/null
+++ b/source4/min_versions.m4
@@ -0,0 +1,6 @@
+# Minimum and exact required versions for various libraries
+# if we use the ones installed in the system.
+TDB_MIN_VERSION=1.1.3
+TALLOC_MIN_VERSION=1.3.0
+LDB_REQUIRED_VERSION=0.9.3
+TEVENT_REQUIRED_VERSION=0.9.4
--
Samba Shared Repository
More information about the samba-cvs
mailing list