From f619e90e27d88a9a72d9f311e7c78903917281c9 Mon Sep 17 00:00:00 2001 Package: directfb Version: 1.0.1 From: Guillem Jover Date: Thu, 13 Dec 2007 10:53:22 +0200 Status: applied Subject: [PATCH] Do not leak static labraries for dynamic linking --- directfb-config.in | 6 +++--- directfb.pc.in | 3 ++- lib/direct/direct.pc.in | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/directfb-config.in b/directfb-config.in index 4db39b6..ac73b9f 100644 --- a/directfb-config.in +++ b/directfb-config.in @@ -300,10 +300,10 @@ if test "$echo_libs" = "yes"; then libs=-L@libdir@ if test "$lib_directfb" = "yes"; then - libs="$libs -ldirectfb -lfusion -ldirect @THREADLIB@ @ZLIB_LIBS@" + libs="$libs -ldirectfb -lfusion -ldirect @THREADLIB@" - if test -z "$echo_static"; then - libs="$libs @DYNLIB@" + if test -n "$echo_static"; then + libs="$libs @DYNLIB@ @ZLIB_LIBS@" fi fi diff --git a/directfb.pc.in b/directfb.pc.in index cab5e79..a02f4f1 100644 --- a/directfb.pc.in +++ b/directfb.pc.in @@ -7,5 +7,6 @@ Name: DirectFB Description: Graphics and windowing library for the Linux frame buffer device Version: @VERSION@ Requires: fusion direct -Libs: -L${libdir} -ldirectfb @THREADLIB@ @DYNLIB@ @ZLIB_LIBS@ @OSX_LIBS@ +Libs: -L${libdir} -ldirectfb @THREADLIB@ @OSX_LIBS@ +Libs.private: -L${libdir} @DYNLIB@ @ZLIB_LIBS@ Cflags: @THREADFLAGS@ -I@INCLUDEDIR@ diff --git a/lib/direct/direct.pc.in b/lib/direct/direct.pc.in index 3db4fda..ee54401 100644 --- a/lib/direct/direct.pc.in +++ b/lib/direct/direct.pc.in @@ -6,5 +6,6 @@ includedir=@includedir@ Name: Direct Description: DirectFB base development library Version: @VERSION@ -Libs: -L${libdir} -ldirect @THREADLIB@ @DYNLIB@ +Libs: -L${libdir} -ldirect @THREADLIB@ +Libs.private: -L${libdir} @DYNLIB@ Cflags: @THREADFLAGS@ -I@INCLUDEDIR@ -- 1.5.3.7