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 <jengelh@inai.de>
Reviewed-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/auth/credentials/samba-credentials.pc.in b/auth/credentials/samba-credentials.pc.in
index 9a0db509ee9f4118dbe6569c19de66033e1f401a..d25bf5e2b77ab8c2b1c726ecde31425bf40152ab 100644 (file)
--- 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
index 597bbd10ab9f779ff1ef64e64403bb58812357b6..581b7e5ac1452a2f09f128eef89d0d0625b1aa9e 100644 (file)
--- 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
index 223502803b74b76773eecb2f8cb6106aa469a44e..53e83d9abdc85b1c09dd91f74c6ded85c1a9015d 100644 (file)
--- 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
index 1c80aa99802bbd90430008d96f31359569ad06e4..cd2d74a22ac11f5c84180b7a2e579469409c5153 100644 (file)
--- 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