From 735c1cd2da15167748e92ba6de48fdb5169db587 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell 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 Autobuild-Date: Wed Dec 8 12:46:00 CET 2010 on sn-devel-104 --- lib/talloc/pytalloc-util.pc.in | 2 +- lib/talloc/talloc.pc.in | 2 +- lib/tdb/tdb.pc.in | 2 +- lib/tevent/tevent.pc.in | 2 +- lib/torture/torture.pc.in | 2 +- lib/util/samba-util.pc.in | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/talloc/pytalloc-util.pc.in b/lib/talloc/pytalloc-util.pc.in index b17b373755..bc704b4929 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 5ce2109866..437281a69a 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 6f8f553736..b78419ea78 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 b1dd439785..1091ff00f1 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 6582816cb5..459b35c582 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 e61ee4455a..a49c1d0290 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 -- cgit