From: Andrew Tridgell Date: Wed, 8 Dec 2010 09:41:37 +0000 (+1100) Subject: s4-pkgconfig: add @LIB_RPATH@ to our link flags X-Git-Tag: samba-4.0.0alpha14~397 X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=735c1cd2da15167748e92ba6de48fdb5169db587;p=ira%2Fwip.git 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 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 b17b373755f..bc704b49294 100644 --- 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 5ce2109866c..437281a69ab 100644 --- 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 6f8f553736c..b78419ea784 100644 --- 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 b1dd4397855..1091ff00f1e 100644 --- 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 6582816cb53..459b35c582a 100644 --- 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 e61ee4455a9..a49c1d0290e 100644 --- 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 9cff0ca218c..f7a1651a48d 100644 --- 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 80eace1befb..d400ef1da04 100644 --- 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 f50d2a8b222..f32226d5e4c 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 1a0b6d99046..691f73e7fc0 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 2afca04b739..348ae8b95d6 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 4848cbc8f0d..fe5c66d9871 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 386817d4aae..e9239317e2d 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 798b8df1299..b79507ac0b5 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 030df932a53..f781f232e29 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 c034b0fbfcb..1c80aa99802 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 7a6072c9266..307f27ba94d 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 d521436a11f..18150ad9e62 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