build: correct package dependencies

The wscript_build files convey what header files belong to which logical package. For example, # lib/util/wscript_build: bld.SAMBA_LIBRARY('samba-util', public_headers='... data_blob.h ...' # auth/credentials/wscript_build: bld.SAMBA_LIBRARY('samba-credentials', public_headers='credentials.h', Now, credentials.h #includes <util/data_blob.h> and therefore, samba-credentials.pc must have a Requires: samba-util. Similarly for other parts. Signed-off-by: Jan Engelhardt <[email protected]> Reviewed-by: David Disseldorp <[email protected]> Reviewed-by: Andreas Schneider <[email protected]>
arter97 · Apr 18, 2017 · e5f2dfa · e5f2dfa
1 parent 76b351e
commit e5f2dfa
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/auth/credentials/samba-credentials.pc.in b/auth/credentials/samba-credentials.pc.in
@@ -6,6 +6,7 @@ modulesdir=${prefix}/modules/gensec
 
 Name: samba-credentials
 Description: Credentials management
+Requires: samba-util ndr
 Version: @PACKAGE_VERSION@
 Libs: @LIB_RPATH@ -L${libdir} -lsamba-credentials
 Cflags: -I${includedir}  -DHAVE_IMMEDIATE_STRUCTURES=1
diff --git a/librpc/ndr_krb5pac.pc.in b/librpc/ndr_krb5pac.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: ndr-krb5pac
 Description: NDR marshallers for the KRB5 PAC formats
-Requires: ndr
+Requires: ndr ndr_standard
 Version: @PACKAGE_VERSION@
 Libs: @LIB_RPATH@ -L${libdir} -lndr-krb5pac
 Cflags: -I${includedir}  -DHAVE_IMMEDIATE_STRUCTURES=1 -D_GNU_SOURCE=1
diff --git a/source4/librpc/dcerpc.pc.in b/source4/librpc/dcerpc.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: dcerpc
 Description: DCE/RPC client library
-Requires: ndr
+Requires: ndr samba-util
 Version: @PACKAGE_VERSION@
 Libs: @LIB_RPATH@ -L${libdir} -ldcerpc -ldcerpc-binding
 Cflags: -I${includedir} -DHAVE_IMMEDIATE_STRUCTURES=1
diff --git a/source4/librpc/dcerpc_samr.pc.in b/source4/librpc/dcerpc_samr.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: dcerpc_samr
 Description: DCE/RPC client library - SAMR
-Requires.private: dcerpc ndr
+Requires: dcerpc ndr ndr_standard
 Version: @PACKAGE_VERSION@
 Libs: @LIB_RPATH@ -L${libdir} -ldcerpc-samr
 Cflags: -I${includedir}  -DHAVE_IMMEDIATE_STRUCTURES=1