From 6a2a57832709798d99d19ff4c587e22f3b3c150d Mon Sep 17 00:00:00 2001
From: Gaetan Nadon <memsize@videotron.ca>
Date: Thu, 7 Jan 2010 15:23:34 -0500
Subject: macros: use PKG_CONFIG variable rather than executable name

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@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
---
 xorg-server.m4 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'xorg-server.m4')

diff --git a/xorg-server.m4 b/xorg-server.m4
index 2d16438e1..bdecf6227 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
-- 
cgit v1.2.3