The branch, v4-0-test has been updated via 7fccd85cc673c139bc1d57915e0fccd22316998c (commit) via 1b084e85c1f5963d924f7764ae751f8cd8e57364 (commit) via 2073346828ffa1d9c35105eadd7afddd3a76a045 (commit) via 64a6887ecddc1599bde5dcb06d0b74ffea1def0c (commit) from 21fcf7c419658b3ae296428ca7a4ccf2288c17fe (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test - Log ----------------------------------------------------------------- commit 7fccd85cc673c139bc1d57915e0fccd22316998c Author: Jelmer Vernooij <[EMAIL PROTECTED]> Date: Fri Apr 4 16:03:54 2008 +0200 Install pidl by default if ExtUtils::MakeMaker is available. This should make the build process for openchange users easier. commit 1b084e85c1f5963d924f7764ae751f8cd8e57364 Merge: 2073346828ffa1d9c35105eadd7afddd3a76a045 21fcf7c419658b3ae296428ca7a4ccf2288c17fe Author: Jelmer Vernooij <[EMAIL PROTECTED]> Date: Fri Apr 4 16:02:17 2008 +0200 Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into openchange Conflicts: source/headermap.txt commit 2073346828ffa1d9c35105eadd7afddd3a76a045 Author: Jelmer Vernooij <[EMAIL PROTECTED]> Date: Thu Apr 3 02:28:31 2008 +0200 Install libevents since it's required by samba-gtk. commit 64a6887ecddc1599bde5dcb06d0b74ffea1def0c Author: Jelmer Vernooij <[EMAIL PROTECTED]> Date: Thu Apr 3 01:36:03 2008 +0200 Fix installation of dcerpc_atsvc and registry as required by samba-gtk. ----------------------------------------------------------------------- Summary of changes: source/configure.ac | 2 ++ source/headermap.txt | 4 ++-- source/lib/events/config.mk | 6 ++++-- source/lib/registry/registry.h | 4 ++++ source/lib/registry/registry.pc.in | 4 ++-- source/libcli/wbclient/config.mk | 2 -- source/librpc/config.mk | 7 +++++-- .../{dcerpc_samr.pc.in => dcerpc_atsvc.pc.in} | 6 +++--- source/librpc/rpc/dcerpc.h | 4 ++++ source/librpc/rpc/dcerpc_util.c | 2 +- source/pidl/config.m4 | 9 +++++++++ source/pidl/config.mk | 4 ++++ 12 files changed, 40 insertions(+), 14 deletions(-) copy source/librpc/{dcerpc_samr.pc.in => dcerpc_atsvc.pc.in} (65%) create mode 100644 source/pidl/config.m4 Changeset truncated at 500 lines: diff --git a/source/configure.ac b/source/configure.ac index 0e264d3..66fb696 100644 --- a/source/configure.ac +++ b/source/configure.ac @@ -26,6 +26,7 @@ m4_include(lib/popt/samba.m4) m4_include(lib/charset/config.m4) m4_include(lib/socket/config.m4) m4_include(nsswitch/nsstest.m4) +m4_include(pidl/config.m4) AC_CONFIG_FILES(lib/registry/registry.pc) AC_CONFIG_FILES(librpc/dcerpc.pc) @@ -34,6 +35,7 @@ AC_CONFIG_FILES(torture/torture.pc) AC_CONFIG_FILES(auth/gensec/gensec.pc) AC_CONFIG_FILES(param/samba-hostconfig.pc) AC_CONFIG_FILES(librpc/dcerpc_samr.pc) +AC_CONFIG_FILES(librpc/dcerpc_atsvc.pc) SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= 1.2.0, [], diff --git a/source/headermap.txt b/source/headermap.txt index 670b14c..fbfc56e 100644 --- a/source/headermap.txt +++ b/source/headermap.txt @@ -69,5 +69,5 @@ lib/util/wrap_xattr.h: wrap_xattr.h lib/events/events.h: events/events.h lib/events/events_internal.h: events/events_internal.h libcli/ldap/ldap_ndr.h: ldap_ndr.h -libcli/wbclient/wbclient.h: wbclient/wbclient.h -lib/gencache/gencache.h: gencache.h +lib/events/events.h: events.h +lib/events/events_internal.h: events_internal.h diff --git a/source/lib/events/config.mk b/source/lib/events/config.mk index 8001699..1e402f8 100644 --- a/source/lib/events/config.mk +++ b/source/lib/events/config.mk @@ -30,13 +30,15 @@ INIT_FUNCTION = s4_events_standard_init ############################## # Start SUBSYSTEM LIBEVENTS -[SUBSYSTEM::LIBEVENTS] +[LIBRARY::LIBEVENTS] OBJ_FILES = events.o events_timed.o events_signal.o PUBLIC_DEPENDENCIES = LIBTALLOC LIBSAMBA-UTIL +SO_VERSION = 0 +VERSION = 0.0.1 # End SUBSYSTEM LIBEVENTS ############################## -# PUBLIC_HEADERS += $(addprefix lib/events/, events.h events_internal.h) +PUBLIC_HEADERS += $(addprefix lib/events/, events.h events_internal.h) [PYTHON::swig_events] SWIG_FILE = events.i diff --git a/source/lib/registry/registry.h b/source/lib/registry/registry.h index ff03f71..a86294b 100644 --- a/source/lib/registry/registry.h +++ b/source/lib/registry/registry.h @@ -22,11 +22,15 @@ #define _REGISTRY_H struct registry_context; +struct loadparm_context; +struct smb_iconv_convenience; #include <talloc.h> #include "libcli/util/werror.h" #include "librpc/gen_ndr/security.h" #include "libcli/util/ntstatus.h" +#include "util/time.h" +#include "util/data_blob.h" /** * The hive API. This API is generally used for diff --git a/source/lib/registry/registry.pc.in b/source/lib/registry/registry.pc.in index 98943a0..d981a45 100644 --- a/source/lib/registry/registry.pc.in +++ b/source/lib/registry/registry.pc.in @@ -5,8 +5,8 @@ [EMAIL PROTECTED]@ Name: registry Description: Windows-style registry library -Requires: ldb -Requires.private: +Requires: talloc +Requires.private: ldb Version: 0.0.1 Libs: -L${libdir} -lregistry Cflags: -I${includedir} -DHAVE_IMMEDIATE_STRUCTURES=1 diff --git a/source/libcli/wbclient/config.mk b/source/libcli/wbclient/config.mk index 32f2f5a..9384a17 100644 --- a/source/libcli/wbclient/config.mk +++ b/source/libcli/wbclient/config.mk @@ -2,5 +2,3 @@ OBJ_FILES = wbclient.o PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBEVENTS PRIVATE_DEPENDENCIES = NDR_WINBIND MESSAGING - -PUBLIC_HEADERS += libcli/wbclient/wbclient.h diff --git a/source/librpc/config.mk b/source/librpc/config.mk index 9b91ba1..e53e512 100644 --- a/source/librpc/config.mk +++ b/source/librpc/config.mk @@ -362,8 +362,8 @@ PUBLIC_DEPENDENCIES = dcerpc NDR_UNIXINFO [LIBRARY::dcerpc_samr] OBJ_FILES = gen_ndr/ndr_samr_c.o -PC_FILE = dcerpc_samr.pc PUBLIC_DEPENDENCIES = dcerpc NDR_SAMR +PC_FILE = dcerpc_samr.pc VERSION = 0.0.1 SO_VERSION = 0 @@ -385,9 +385,12 @@ PUBLIC_DEPENDENCIES = dcerpc NDR_SVCCTL PUBLIC_HEADERS += librpc/gen_ndr/ndr_svcctl_c.h -[SUBSYSTEM::dcerpc_atsvc] +[LIBRARY::dcerpc_atsvc] OBJ_FILES = gen_ndr/ndr_atsvc_c.o PUBLIC_DEPENDENCIES = dcerpc NDR_ATSVC +PC_FILE = dcerpc_atsvc.pc +VERSION = 0.0.1 +SO_VERSION = 0 PUBLIC_HEADERS += librpc/gen_ndr/ndr_atsvc_c.h diff --git a/source/librpc/dcerpc_samr.pc.in b/source/librpc/dcerpc_atsvc.pc.in similarity index 65% copy from source/librpc/dcerpc_samr.pc.in copy to source/librpc/dcerpc_atsvc.pc.in index c410223..060485c 100644 --- a/source/librpc/dcerpc_samr.pc.in +++ b/source/librpc/dcerpc_atsvc.pc.in @@ -3,9 +3,9 @@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -Name: dcerpc_samr -Description: DCE/RPC client library - SAMR +Name: dcerpc_atsvc +Description: DCE/RPC client library - ATSVC Requires.private: dcerpc ndr Version: 0.0.1 -Libs: -L${libdir} -ldcerpc_samr +Libs: -L${libdir} -ldcerpc_atsvc Cflags: -I${includedir} -DHAVE_IMMEDIATE_STRUCTURES=1 diff --git a/source/librpc/rpc/dcerpc.h b/source/librpc/rpc/dcerpc.h index c4a48a1..805f546 100644 --- a/source/librpc/rpc/dcerpc.h +++ b/source/librpc/rpc/dcerpc.h @@ -358,5 +358,9 @@ NTSTATUS dcerpc_ndr_request(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, void *r); +NTSTATUS dcerpc_binding_from_tower(TALLOC_CTX *mem_ctx, + struct epm_tower *tower, + struct dcerpc_binding **b_out); + #endif /* __DCERPC_H__ */ diff --git a/source/librpc/rpc/dcerpc_util.c b/source/librpc/rpc/dcerpc_util.c index dc57735..3b8768c 100644 --- a/source/librpc/rpc/dcerpc_util.c +++ b/source/librpc/rpc/dcerpc_util.c @@ -660,7 +660,7 @@ _PUBLIC_ enum dcerpc_transport_t dcerpc_transport_by_tower(struct epm_tower *tow return (unsigned int)-1; } -NTSTATUS dcerpc_binding_from_tower(TALLOC_CTX *mem_ctx, +_PUBLIC_ NTSTATUS dcerpc_binding_from_tower(TALLOC_CTX *mem_ctx, struct epm_tower *tower, struct dcerpc_binding **b_out) { diff --git a/source/pidl/config.m4 b/source/pidl/config.m4 new file mode 100644 index 0000000..8b8bc5a --- /dev/null +++ b/source/pidl/config.m4 @@ -0,0 +1,9 @@ +# Check whether ExtUtils::ExtMaker is available + +if perl -e "use ExtUtils::MakeMaker" 2>/dev/null; then + HAVE_PERL_EXTUTILS_MAKEMAKER=1 +else + HAVE_PERL_EXTUTILS_MAKEMAKER=0 +fi + +AC_SUBST(HAVE_PERL_EXTUTILS_MAKEMAKER) diff --git a/source/pidl/config.mk b/source/pidl/config.mk index c469afa..0d36473 100644 --- a/source/pidl/config.mk +++ b/source/pidl/config.mk @@ -7,6 +7,10 @@ pidl-testcov: pidl/Makefile installpidl:: pidl/Makefile $(MAKE) -C pidl install_vendor PREFIX=$(prefix) +ifeq ($(HAVE_PERL_EXTUTILS_MAKEMAKER),1) +install:: installpidl +endif + idl_full:: pidl/lib/Parse/Pidl/IDL.pm pidl/lib/Parse/Pidl/Expr.pm @CPP="$(CPP)" PERL="$(PERL)" srcdir=$(srcdir) $(srcdir)/script/build_idl.sh FULL -- Samba Shared Repository