summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2010-01-07 15:23:34 -0500
committerPeter Hutterer <peter.hutterer@who-t.net>2010-01-19 17:35:55 +1300
commitd76f09406d07fd04a03d9cb3965419b1e95bdd03 (patch)
tree174485fd3b5499f87411684f036bb9bcd4735e40
parent08c2df881d61fccfd488b5ca4482686a7f3b47c0 (diff)
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> (cherry picked from commit 6a2a57832709798d99d19ff4c587e22f3b3c150d)
-rw-r--r--xorg-server.m43
1 files changed, 2 insertions, 1 deletions
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