s4-pkgconfig: add @LIB_RPATH@ to our link flags

this is only set when rpath is used on install. It ensures that
applications that link against Samba libraries get the rpath right

Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Wed Dec  8 12:46:00 CET 2010 on sn-devel-104

diff --git a/lib/talloc/pytalloc-util.pc.in b/lib/talloc/pytalloc-util.pc.in
index b17b373755f7a98750aafbd1967f6b5d60bef5d3..bc704b4929416977235a18d3f9d110358127a984 100644 (file)
--- a/lib/talloc/pytalloc-util.pc.in
+++ b/lib/talloc/pytalloc-util.pc.in
@@ -7,5 +7,5 @@ Name: pytalloc-util
 Description: Utility functions for using talloc objects with Python
 Version: @TALLOC_VERSION@
 Libs: -L${libdir} -lpytalloc-util
-Cflags: -I${includedir} 
+Cflags: @LIB_RPATH@ -I${includedir}
 URL: http://talloc.samba.org/

diff --git a/lib/talloc/talloc.pc.in b/lib/talloc/talloc.pc.in
index 5ce2109866cb81084933d4a55925ba928b8e775d..437281a69abe665c0ab7d4a67466f264a8792810 100644 (file)
--- a/lib/talloc/talloc.pc.in
+++ b/lib/talloc/talloc.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: talloc 
 Description: A hierarchical pool based memory system with destructors
 Version: @TALLOC_VERSION@
-Libs: -L${libdir} -ltalloc
+Libs: @LIB_RPATH@ -L${libdir} -ltalloc
 Cflags: -I${includedir} 
 URL: http://talloc.samba.org/

diff --git a/lib/tdb/tdb.pc.in b/lib/tdb/tdb.pc.in
index 6f8f553736c31df3a4f6976c01df5b3e72b825b6..b78419ea7845b28d01920e41ec5379ab15f4a0ef 100644 (file)
--- a/lib/tdb/tdb.pc.in
+++ b/lib/tdb/tdb.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: tdb
 Description: A trivial database
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -ltdb
+Libs: @LIB_RPATH@ -L${libdir} -ltdb
 Cflags: -I${includedir} 
 URL: http://tdb.samba.org/

diff --git a/lib/tevent/tevent.pc.in b/lib/tevent/tevent.pc.in
index b1dd43978556fb6069a73265566c780dbcf174bf..1091ff00f1e4d5e6562ee42556ca9984895069bf 100644 (file)
--- a/lib/tevent/tevent.pc.in
+++ b/lib/tevent/tevent.pc.in
@@ -8,5 +8,5 @@ Description: An event system library
 Version: @PACKAGE_VERSION@
 Requires: talloc
 Libs: -L${libdir} -ltevent
-Cflags: -I${includedir} 
+Cflags: @LIB_RPATH@ -I${includedir}
 URL: http://samba.org/

diff --git a/lib/torture/torture.pc.in b/lib/torture/torture.pc.in
index 6582816cb53cd8faf38d10333539eec5662b2ead..459b35c582ad6d850870fa13440d89485f7923b1 100644 (file)
--- a/lib/torture/torture.pc.in
+++ b/lib/torture/torture.pc.in
@@ -8,5 +8,5 @@ Name: torture
 Description: Samba torture (test) suite
 Requires: talloc
 Version: 0.0.1
-Libs: -L${libdir} -ltorture 
+Libs: @LIB_RPATH@ -L${libdir} -ltorture
 Cflags: -I${includedir}  -DHAVE_IMMEDIATE_STRUCTURES=1

diff --git a/lib/util/samba-util.pc.in b/lib/util/samba-util.pc.in
index e61ee4455a9840e5884cc0bdb31223248b6ec6b2..a49c1d0290e7e7e9b52422d85e70da82e631de63 100644 (file)
--- a/lib/util/samba-util.pc.in
+++ b/lib/util/samba-util.pc.in
@@ -7,5 +7,5 @@ Name: samba-util
 Description: Samba utility functions
 Requires: talloc tevent
 Version: 0.0.1
-Libs: -L${libdir} -lsamba-util
+Libs: @LIB_RPATH@ -L${libdir} -lsamba-util
 Cflags: -I${includedir}  -DHAVE_IMMEDIATE_STRUCTURES=1

diff --git a/librpc/ndr.pc.in b/librpc/ndr.pc.in
index 9cff0ca218cf2ba9a5fde415d491cae3005c466c..f7a1651a48d0fb12c43c1ab046d601577b1ef3bc 100644 (file)
--- a/librpc/ndr.pc.in
+++ b/librpc/ndr.pc.in
@@ -7,5 +7,5 @@ Name: ndr
 Description: Network Data Representation Core Library
 Requires: samba-hostconfig talloc
 Version: 0.0.1
-Libs: -L${libdir} -lndr 
+Libs: @LIB_RPATH@ -L${libdir} -lndr
 Cflags: -I${includedir}  -DHAVE_IMMEDIATE_STRUCTURES=1 -D_GNU_SOURCE=1

diff --git a/librpc/ndr_standard.pc.in b/librpc/ndr_standard.pc.in
index 80eace1befbc8aba57a8dcbe417f38d1381a9071..d400ef1da0441307f94e9498f3615d91630ed2ad 100644 (file)
--- a/librpc/ndr_standard.pc.in
+++ b/librpc/ndr_standard.pc.in
@@ -7,5 +7,5 @@ Name: ndr-standard
 Description: NDR marshallers for the standard set of DCE/RPC interfaces
 Requires: ndr
 Version: 0.0.1
-Libs: -L${libdir} -lndr-standard
+Libs: @LIB_RPATH@ -L${libdir} -lndr-standard
 Cflags: -I${includedir}  -DHAVE_IMMEDIATE_STRUCTURES=1 -D_GNU_SOURCE=1

diff --git a/source4/auth/gensec/gensec.pc.in b/source4/auth/gensec/gensec.pc.in
index f50d2a8b222e89271c1b7ccd787423c54d4d0ca8..f32226d5e4c3f6bf930b98a94f8af5fc91ea716c 100644 (file)
--- a/source4/auth/gensec/gensec.pc.in
+++ b/source4/auth/gensec/gensec.pc.in
@@ -7,5 +7,5 @@ modulesdir=${prefix}/modules/gensec
 Name: gensec
 Description: Generic Security Library
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lgensec 
+Libs: @LIB_RPATH@ -L${libdir} -lgensec
 Cflags: -I${includedir}  -DHAVE_IMMEDIATE_STRUCTURES=1

diff --git a/source4/dsdb/samdb.pc.in b/source4/dsdb/samdb.pc.in
index 1a0b6d9904657b841eb2b22b8630b7ef1b957961..691f73e7fc0d1fdf849a3212388750e1b5ee7327 100644 (file)
--- a/source4/dsdb/samdb.pc.in
+++ b/source4/dsdb/samdb.pc.in
@@ -6,5 +6,5 @@ includedir=@includedir@
 Name: samdb
 Description: Sam Database
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lsamdb
+Libs: @LIB_RPATH@ -L${libdir} -lsamdb
 Cflags: -I${includedir} -DHAVE_IMMEDIATE_STRUCTURES=1

diff --git a/source4/lib/ldb/pyldb-util.pc.in b/source4/lib/ldb/pyldb-util.pc.in
index 2afca04b739c8c4fdf0bb2f9a83b039ccb943d10..348ae8b95d6814269e0312d2e93b1950201e812b 100644 (file)
--- a/source4/lib/ldb/pyldb-util.pc.in
+++ b/source4/lib/ldb/pyldb-util.pc.in
@@ -8,6 +8,6 @@ Name: pyldb-util
 Description: Python bindings for LDB
 Version: @PACKAGE_VERSION@
 Requires: ldb
-Libs: -L${libdir} -lpyldb-util
+Libs: @LIB_RPATH@ -L${libdir} -lpyldb-util
 Cflags: -I${includedir}
 URL: http://ldb.samba.org/

diff --git a/source4/lib/policy/policy.pc.in b/source4/lib/policy/policy.pc.in
index 4848cbc8f0df917ead9fcc5b1e634018c79c2928..fe5c66d9871f57e601d07bed9b9d241d4795630e 100644 (file)
--- a/source4/lib/policy/policy.pc.in
+++ b/source4/lib/policy/policy.pc.in
@@ -8,5 +8,5 @@ Description: Active Directory Group Policy library
 Requires: talloc
 Requires.private: ldb
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lpolicy
+Libs: @LIB_RPATH@ -L${libdir} -lpolicy
 Cflags: -I${includedir}  -DHAVE_IMMEDIATE_STRUCTURES=1

diff --git a/source4/lib/registry/registry.pc.in b/source4/lib/registry/registry.pc.in
index 386817d4aae2105c7749ad87741d29825a0fb321..e9239317e2d1645c223c4de0c06fbae6ddee7e13 100644 (file)
--- a/source4/lib/registry/registry.pc.in
+++ b/source4/lib/registry/registry.pc.in
@@ -8,5 +8,5 @@ Description: Windows-style registry library
 Requires: talloc
 Requires.private: ldb
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lregistry 
+Libs: @LIB_RPATH@ -L${libdir} -lregistry
 Cflags: -I${includedir}  -DHAVE_IMMEDIATE_STRUCTURES=1

diff --git a/source4/librpc/dcerpc.pc.in b/source4/librpc/dcerpc.pc.in
index 798b8df1299933d7560dd5cabaf5b4a1910eb270..b79507ac0b55de60e5db7b7b262a04e1701abb10 100644 (file)
--- a/source4/librpc/dcerpc.pc.in
+++ b/source4/librpc/dcerpc.pc.in
@@ -7,5 +7,5 @@ Name: dcerpc
 Description: DCE/RPC client library
 Requires: ndr
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -ldcerpc 
+Libs: @LIB_RPATH@ -L${libdir} -ldcerpc
 Cflags: -I${includedir} -DHAVE_IMMEDIATE_STRUCTURES=1

diff --git a/source4/librpc/dcerpc_atsvc.pc.in b/source4/librpc/dcerpc_atsvc.pc.in
index 030df932a536f46e94403ef7c41a09bd15549f28..f781f232e29c6da423d61290649221778089739a 100644 (file)
--- a/source4/librpc/dcerpc_atsvc.pc.in
+++ b/source4/librpc/dcerpc_atsvc.pc.in
@@ -7,5 +7,5 @@ Name: dcerpc_atsvc
 Description: DCE/RPC client library - ATSVC
 Requires.private: dcerpc ndr
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -ldcerpc-atsvc
+Libs: @LIB_RPATH@ -L${libdir} -ldcerpc-atsvc
 Cflags: -I${includedir}  -DHAVE_IMMEDIATE_STRUCTURES=1

diff --git a/source4/librpc/dcerpc_samr.pc.in b/source4/librpc/dcerpc_samr.pc.in
index c034b0fbfcbe1083c376d1dd535e539e1fc63227..1c80aa99802bbd90430008d96f31359569ad06e4 100644 (file)
--- a/source4/librpc/dcerpc_samr.pc.in
+++ b/source4/librpc/dcerpc_samr.pc.in
@@ -7,5 +7,5 @@ Name: dcerpc_samr
 Description: DCE/RPC client library - SAMR
 Requires.private: dcerpc ndr
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -ldcerpc-samr
+Libs: @LIB_RPATH@ -L${libdir} -ldcerpc-samr
 Cflags: -I${includedir}  -DHAVE_IMMEDIATE_STRUCTURES=1

diff --git a/source4/param/samba-hostconfig.pc.in b/source4/param/samba-hostconfig.pc.in
index 7a6072c926641ae0fbd43906636a32df618b95ec..307f27ba94d30dbdb441cce799da35b727da52e7 100644 (file)
--- a/source4/param/samba-hostconfig.pc.in
+++ b/source4/param/samba-hostconfig.pc.in
@@ -6,5 +6,5 @@ includedir=@includedir@
 Name: samba-hostconfig
 Description: Host-wide Samba configuration
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lsamba-hostconfig 
+Libs: @LIB_RPATH@ -L${libdir} -lsamba-hostconfig
 Cflags: -I${includedir}  -DHAVE_IMMEDIATE_STRUCTURES=1

diff --git a/source4/rpc_server/dcerpc_server.pc.in b/source4/rpc_server/dcerpc_server.pc.in
index d521436a11feffd86e4ed18874dd19a052ca933f..18150ad9e6205c026e75542c4051ef4e8d6bc715 100644 (file)
--- a/source4/rpc_server/dcerpc_server.pc.in
+++ b/source4/rpc_server/dcerpc_server.pc.in
@@ -7,5 +7,5 @@ Name: dcerpc_server
 Description: DCE/RPC server library
 Requires: dcerpc
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -ldcerpc-server
+Libs: @LIB_RPATH@ -L${libdir} -ldcerpc-server
 Cflags: -I${includedir} -DHAVE_IMMEDIATE_STRUCTURES=1