From 735c1cd2da15167748e92ba6de48fdb5169db587 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 8 Dec 2010 20:41:37 +1100
Subject: 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
---
 source4/auth/gensec/gensec.pc.in       | 2 +-
 source4/dsdb/samdb.pc.in               | 2 +-
 source4/lib/ldb/pyldb-util.pc.in       | 2 +-
 source4/lib/policy/policy.pc.in        | 2 +-
 source4/lib/registry/registry.pc.in    | 2 +-
 source4/librpc/dcerpc.pc.in            | 2 +-
 source4/librpc/dcerpc_atsvc.pc.in      | 2 +-
 source4/librpc/dcerpc_samr.pc.in       | 2 +-
 source4/param/samba-hostconfig.pc.in   | 2 +-
 source4/rpc_server/dcerpc_server.pc.in | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'source4')

diff --git a/source4/auth/gensec/gensec.pc.in b/source4/auth/gensec/gensec.pc.in
index f50d2a8b22..f32226d5e4 100644
--- 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 1a0b6d9904..691f73e7fc 100644
--- 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 2afca04b73..348ae8b95d 100644
--- 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 4848cbc8f0..fe5c66d987 100644
--- 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 386817d4aa..e9239317e2 100644
--- 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 798b8df129..b79507ac0b 100644
--- 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 030df932a5..f781f232e2 100644
--- 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 c034b0fbfc..1c80aa9980 100644
--- 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 7a6072c926..307f27ba94 100644
--- 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 d521436a11..18150ad9e6 100644
--- 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
-- 
cgit