[SCM] Samba Shared Repository - branch master updated - 8b24da201b78ddda3738564f2d69c96ab4ed9919

[Jelmer Vernooij]

The branch, master has been updated
       via  8b24da201b78ddda3738564f2d69c96ab4ed9919 (commit)
      from  22703bf3ffc3692a719d6bd593d3705697045bea (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 8b24da201b78ddda3738564f2d69c96ab4ed9919
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Dec 23 19:59:57 2008 +0100

    Allow using external libtevent.

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

Summary of changes:
 lib/tevent/config.mk               |   11 -----------
 source4/build/smb_build/summary.pm |    1 +
 source4/configure.ac               |   13 +++++++++++--
 source4/main.mk                    |    1 -
 4 files changed, 12 insertions(+), 14 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/tevent/config.mk b/lib/tevent/config.mk
index 01c628c..e4fb9a8 100644
--- a/lib/tevent/config.mk
+++ b/lib/tevent/config.mk
@@ -44,14 +44,3 @@ CFLAGS = -I../lib/tevent
 LIBTEVENT_OBJ_FILES = $(addprefix $(libteventsrcdir)/, tevent.o tevent_timed.o tevent_signal.o tevent_debug.o tevent_util.o)
 
 PUBLIC_HEADERS += $(addprefix $(libteventsrcdir)/, tevent.h tevent_internal.h)
-
-# TODO: Change python stuff to tevent
-[PYTHON::swig_events]
-LIBRARY_REALNAME = tevent.$(SHLIBEXT)
-PRIVATE_DEPENDENCIES = LIBTEVENT PYTALLOC LIBSAMBA-UTIL
-
-swig_events_OBJ_FILES = $(libteventsrcdir)/pytevent.o
-
-$(swig_events_OBJ_FILES): CFLAGS+=$(CFLAG_NO_CAST_QUAL)
-
-PC_FILES += $(libteventsrcdir)/tevent.pc
diff --git a/source4/build/smb_build/summary.pm b/source4/build/smb_build/summary.pm
index f6c1c50..c791621 100644
--- a/source4/build/smb_build/summary.pm
+++ b/source4/build/smb_build/summary.pm
@@ -57,6 +57,7 @@ sub show($$)
 	showisexternal($output, "popt", "LIBPOPT");
 	showisexternal($output, "talloc", "LIBTALLOC");
 	showisexternal($output, "tdb", "LIBTDB");
+	showisexternal($output, "tevent", "LIBTEVENT");
 	showisexternal($output, "ldb", "LIBLDB");
 	print "Developer mode: ".(enabled($config->{developer})?"yes":"no")."\n";
 	print "Automatic dependencies: ".
diff --git a/source4/configure.ac b/source4/configure.ac
index aa5a3f3..45154c8 100644
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -34,7 +34,6 @@ m4_include(../nsswitch/nsstest.m4)
 m4_include(../pidl/config.m4)
 
 AC_CONFIG_FILES(lib/registry/registry.pc)
-AC_CONFIG_FILES(../lib/tevent/tevent.pc)
 AC_CONFIG_FILES(librpc/dcerpc.pc)
 AC_CONFIG_FILES(../librpc/ndr.pc)
 AC_CONFIG_FILES(../lib/torture/torture.pc)
@@ -61,6 +60,17 @@ SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb >= 1.1.3,
 
 SMB_INCLUDE_MK(../lib/tdb/python.mk) 
 
+SMB_EXT_LIB_FROM_PKGCONFIG(LIBTEVENT, tevent >= 1.0.0,
+	[],
+	[
+		m4_include(../lib/tevent/libtevent.m4)
+		SMB_INCLUDE_MK(../lib/tevent/config.mk)
+		AC_CONFIG_FILES(../lib/tevent/tevent.pc)
+	]
+)
+
+SMB_INCLUDE_MK(../lib/tevent/python.mk) 
+
 SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb = 0.9.1,
 	[
 		SMB_INCLUDE_MK(lib/ldb/ldb_ildap/config.mk)
@@ -96,7 +106,6 @@ SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb = 0.9.1,
 SMB_INCLUDE_MK(lib/ldb/python.mk) 
 
 m4_include(lib/tls/config.m4)
-m4_include(../lib/tevent/libtevent.m4)
 
 dnl m4_include(auth/kerberos/config.m4)
 m4_include(auth/gensec/config.m4)
diff --git a/source4/main.mk b/source4/main.mk
index e54196a..1d4ffc5 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -14,7 +14,6 @@ mkinclude lib/ldb-samba/config.mk
 mkinclude lib/tls/config.mk
 mkinclude lib/registry/config.mk
 mkinclude lib/messaging/config.mk
-mkinclude ../lib/tevent/config.mk
 mkinclude lib/events/config.mk
 mkinclude lib/cmdline/config.mk
 mkinclude ../lib/socket_wrapper/config.mk


-- 
Samba Shared Repository