From 8495d17c1a97489a75b777d79e69f9680267fd28 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 3 Apr 2008 01:36:03 +0200 Subject: Fix installation of dcerpc_atsvc and registry as required by samba-gtk. (This used to be commit 64a6887ecddc1599bde5dcb06d0b74ffea1def0c) --- source4/configure.ac | 1 + source4/lib/registry/registry.pc.in | 4 ++-- source4/librpc/config.mk | 7 +++++-- source4/librpc/dcerpc_atsvc.pc.in | 11 +++++++++++ 4 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 source4/librpc/dcerpc_atsvc.pc.in (limited to 'source4') diff --git a/source4/configure.ac b/source4/configure.ac index 0e264d3474..01f514e859 100644 --- a/source4/configure.ac +++ b/source4/configure.ac @@ -34,6 +34,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/source4/lib/registry/registry.pc.in b/source4/lib/registry/registry.pc.in index 98943a0736..d981a45b2c 100644 --- a/source4/lib/registry/registry.pc.in +++ b/source4/lib/registry/registry.pc.in @@ -5,8 +5,8 @@ includedir=@includedir@ 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/source4/librpc/config.mk b/source4/librpc/config.mk index 9b91ba1115..e53e512bc6 100644 --- a/source4/librpc/config.mk +++ b/source4/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/source4/librpc/dcerpc_atsvc.pc.in b/source4/librpc/dcerpc_atsvc.pc.in new file mode 100644 index 0000000000..c4102237d3 --- /dev/null +++ b/source4/librpc/dcerpc_atsvc.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: dcerpc_samr +Description: DCE/RPC client library - SAMR +Requires.private: dcerpc ndr +Version: 0.0.1 +Libs: -L${libdir} -ldcerpc_samr +Cflags: -I${includedir} -DHAVE_IMMEDIATE_STRUCTURES=1 -- cgit From adc09857420c4a9306148e8d15ff5faf633ba7a5 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 3 Apr 2008 02:28:31 +0200 Subject: Install libevents since it's required by samba-gtk. (This used to be commit 2073346828ffa1d9c35105eadd7afddd3a76a045) --- source4/headermap.txt | 2 ++ source4/lib/events/config.mk | 6 ++++-- source4/lib/registry/registry.h | 4 ++++ source4/librpc/dcerpc_atsvc.pc.in | 6 +++--- source4/librpc/rpc/dcerpc.h | 4 ++++ source4/librpc/rpc/dcerpc_util.c | 2 +- 6 files changed, 18 insertions(+), 6 deletions(-) (limited to 'source4') diff --git a/source4/headermap.txt b/source4/headermap.txt index 8d4d78bd35..7984149837 100644 --- a/source4/headermap.txt +++ b/source4/headermap.txt @@ -67,3 +67,5 @@ lib/util/util_tdb.h: util_tdb.h lib/util/util_ldb.h: util_ldb.h lib/util/wrap_xattr.h: wrap_xattr.h libcli/ldap/ldap_ndr.h: ldap_ndr.h +lib/events/events.h: events.h +lib/events/events_internal.h: events_internal.h diff --git a/source4/lib/events/config.mk b/source4/lib/events/config.mk index 8001699aee..1e402f80d6 100644 --- a/source4/lib/events/config.mk +++ b/source4/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/source4/lib/registry/registry.h b/source4/lib/registry/registry.h index ff03f71eb2..a86294bf46 100644 --- a/source4/lib/registry/registry.h +++ b/source4/lib/registry/registry.h @@ -22,11 +22,15 @@ #define _REGISTRY_H struct registry_context; +struct loadparm_context; +struct smb_iconv_convenience; #include #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/source4/librpc/dcerpc_atsvc.pc.in b/source4/librpc/dcerpc_atsvc.pc.in index c4102237d3..060485c3fc 100644 --- a/source4/librpc/dcerpc_atsvc.pc.in +++ b/source4/librpc/dcerpc_atsvc.pc.in @@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -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/source4/librpc/rpc/dcerpc.h b/source4/librpc/rpc/dcerpc.h index c4a48a1119..805f5463a9 100644 --- a/source4/librpc/rpc/dcerpc.h +++ b/source4/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/source4/librpc/rpc/dcerpc_util.c b/source4/librpc/rpc/dcerpc_util.c index dc57735713..3b8768ccc2 100644 --- a/source4/librpc/rpc/dcerpc_util.c +++ b/source4/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) { -- cgit From faa3dec34a67b59fc7e733a2ce3a9d9f2cb34b2d Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 4 Apr 2008 16:03:54 +0200 Subject: Install pidl by default if ExtUtils::MakeMaker is available. This should make the build process for openchange users easier. (This used to be commit 7fccd85cc673c139bc1d57915e0fccd22316998c) --- source4/configure.ac | 1 + source4/libcli/wbclient/config.mk | 2 -- source4/pidl/config.mk | 4 ++++ 3 files changed, 5 insertions(+), 2 deletions(-) (limited to 'source4') diff --git a/source4/configure.ac b/source4/configure.ac index 01f514e859..66fb69694e 100644 --- a/source4/configure.ac +++ b/source4/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) diff --git a/source4/libcli/wbclient/config.mk b/source4/libcli/wbclient/config.mk index 32f2f5aeed..9384a172ff 100644 --- a/source4/libcli/wbclient/config.mk +++ b/source4/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/source4/pidl/config.mk b/source4/pidl/config.mk index c469afa1f5..0d36473ade 100644 --- a/source4/pidl/config.mk +++ b/source4/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 -- cgit