diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-04-03 01:36:03 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-04-03 01:36:03 +0200 |
| commit | 8495d17c1a97489a75b777d79e69f9680267fd28 (patch) | |
| tree | 3debd2cfbdb59e36c128ac1972130894715b34de | |
| parent | 753824e9cfcbba51a2157eb75cc9ff9b287028fa (diff) | |
| download | samba-8495d17c1a97489a75b777d79e69f9680267fd28.tar.gz samba-8495d17c1a97489a75b777d79e69f9680267fd28.tar.bz2 samba-8495d17c1a97489a75b777d79e69f9680267fd28.zip | |
Fix installation of dcerpc_atsvc and registry as required by samba-gtk.
(This used to be commit 64a6887ecddc1599bde5dcb06d0b74ffea1def0c)
| -rw-r--r-- | source4/configure.ac | 1 | ||||
| -rw-r--r-- | source4/lib/registry/registry.pc.in | 4 | ||||
| -rw-r--r-- | source4/librpc/config.mk | 7 | ||||
| -rw-r--r-- | source4/librpc/dcerpc_atsvc.pc.in | 11 |
4 files changed, 19 insertions, 4 deletions
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 |