From 32c706c4ffd7433dbfc79dba8785b1510d2f053f Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 20 Jun 2010 20:37:26 -0400 Subject: config: declare xserver private dependencies in xorg-server.pc Any module (drivers) depending on xserver also depends on some of the server private dependencies. Any driver including xf86.h depends on xext, kbproto, inputproto and randr. These dependencies are in separate packages, so anything can happen, removal, wrong version, etc... and the driver fails during compilation. Having the private dependencies declared will ensure all packages the server depends on are present and at the correct version. Currently each module attempts to check for server dependencies with various degrees of accuracy. With this patch, the driver will only need to check for its own explicit dependencies. Now that xproto is included in Requires.private it is removed from Requires. All the cflags from both Requires and Requires.private are returned to caller to pkg-config. Reviewed-by: Dan Nicholson Signed-off-by: Gaetan Nadon Signed-off-by: Keith Packard --- xorg-server.pc.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'xorg-server.pc.in') diff --git a/xorg-server.pc.in b/xorg-server.pc.in index 44f886ade..fb238b5cf 100644 --- a/xorg-server.pc.in +++ b/xorg-server.pc.in @@ -15,6 +15,7 @@ abi_extension=@abi_extension@ Name: xorg-server Description: Modular X.Org X Server Version: @PACKAGE_VERSION@ -Requires: pixman-1 pciaccess xproto >= 7.0.17 +Requires: pixman-1 pciaccess +Requires.private: @SDK_REQUIRED_MODULES@ Cflags: -I${sdkdir} @symbol_visibility@ Libs: -L${libdir} -- cgit v1.2.3