[PATCH xserver] macros: use PKG_CONFIG variable rather than executable name

Gaetan Nadon memsize at videotron.ca
Thu Jan 7 12:23:34 PST 2010


User can defined alternate location for pkg-config.
Once option in place, all instances of pkg-config must be converted.

Acked-by: Peter Hutterer <peter.hutterer at who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists at gmail.com>
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 xorg-server.m4 |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/xorg-server.m4 b/xorg-server.m4
index 2d16438..bdecf62 100644
--- a/xorg-server.m4
+++ b/xorg-server.m4
@@ -29,8 +29,9 @@ dnl
 # is defined, then add $1 to $REQUIRED_MODULES.
 
 AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
+	AC_REQUIRE([PKG_PROG_PKG_CONFIG])
 	SAVE_CFLAGS="$CFLAGS"
-	CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`"
+	CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
 	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include "xorg-server.h"
 #if !defined $1
-- 
1.6.0.4

Resending with approval tags to be applied on git master.


More information about the xorg-devel mailing list