sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

s4: avoid overwritting the dceprc.h file from toplevel librpc

Browse Source 
Change back to what was the configuration of header_path before
177ddcb084 so that dcerpc.h is installed
in ${prefix}/include and not in ${prefix}/include/gen_ndr as the
toplevel librpc wants also to put a dcerpc.h file in this directory.

Add some documentation in order to avoid any new regression.

This change should fix problems for openchange team.

Autobuild-User: Matthieu Patou <mat@samba.org>
Autobuild-Date: Mon Feb 21 09:47:05 CET 2011 on sn-devel-104
This commit is contained in:
Matthieu Patou 2011-02-20 13:23:48 +03:00 committed by Matthieu Patou
parent 175227bc71
commit e37db96d2a
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source4/librpc/wscript_build
View File

@ -157,7 +157,14 @@ bld.SAMBA_LIBRARY('dcerpc',
autoproto='rpc/dcerpc_proto.h', autoproto='rpc/dcerpc_proto.h',
public_deps='credentials tevent talloc', public_deps='credentials tevent talloc',
public_headers='rpc/dcerpc.h ../../librpc/gen_ndr/mgmt.h ../../librpc/gen_ndr/ndr_mgmt.h ../../librpc/gen_ndr/ndr_mgmt_c.h ../../librpc/gen_ndr/epmapper.h ../../librpc/gen_ndr/ndr_epmapper.h ../../librpc/gen_ndr/ndr_epmapper_c.h', public_headers='rpc/dcerpc.h ../../librpc/gen_ndr/mgmt.h ../../librpc/gen_ndr/ndr_mgmt.h ../../librpc/gen_ndr/ndr_mgmt_c.h ../../librpc/gen_ndr/epmapper.h ../../librpc/gen_ndr/ndr_epmapper.h ../../librpc/gen_ndr/ndr_epmapper_c.h',
header_path='gen_ndr', # It's very important to keep this form of construction
# it force the sambawaf extension to put everything that match the first element
# (*gen_ndr*) into the dir named by the second element (gen_ndr).
# If we just put header_path = 'gen_ndr' then all the public_headers will go
# in 'gen_ndr' and for dcerpc.h (at least) it will cause a problem as
# we have already a dcerpc.h installed by librpc/wscript_build
# and one will overright the other which is not what we expect.
header_path=[ ('*gen_ndr*', 'gen_ndr') ],
vnum='0.0.1' vnum='0.0.1'
) )