diff options
| author | Stéphane Marchesin <[email protected]> | 2011-09-30 17:49:48 -0700 |
|---|---|---|
| committer | Stéphane Marchesin <[email protected]> | 2011-10-04 11:19:48 -0700 |
| commit | 3db309aecee57d7e0055a49a0e12a491a554347b (patch) | |
| tree | b0c2674ae23fe8ec4852b33892e053dcdd01a477 /src/gallium/state_trackers/xorg | |
| parent | cd9627777c3f1a55560e10912b88b1977c8bfe87 (diff) | |
configure: replace pkg-config calls with $(PKG_CONFIG) in the makefiles.
Us poor souls who cross compile mesa want to be able to specify which pkg-config to pick, or at least just change one place.
Reviewed-by: Brian Paul <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/gallium/state_trackers/xorg')
| -rw-r--r-- | src/gallium/state_trackers/xorg/Makefile | 8 | ||||
| -rw-r--r-- | src/gallium/state_trackers/xorg/xvmc/Makefile | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/gallium/state_trackers/xorg/Makefile b/src/gallium/state_trackers/xorg/Makefile index 7a44d28017b..d42ea5416dc 100644 --- a/src/gallium/state_trackers/xorg/Makefile +++ b/src/gallium/state_trackers/xorg/Makefile @@ -5,12 +5,12 @@ LIBNAME = xorgtracker LIBRARY_INCLUDES = \ -DHAVE_CONFIG_H \ - $(shell pkg-config xextproto --atleast-version=7.0.99.1 \ + $(shell $(PKG_CONFIG) xextproto --atleast-version=7.0.99.1 \ && echo "-DHAVE_XEXTPROTO_71") \ - $(shell pkg-config libkms --atleast-version=1.0 \ + $(shell $(PKG_CONFIG) libkms --atleast-version=1.0 \ && echo "-DHAVE_LIBKMS") \ - $(shell pkg-config libkms --silence-errors --cflags-only-I) \ - $(shell pkg-config --cflags-only-I pixman-1 xorg-server libdrm xproto dri2proto) \ + $(shell $(PKG_CONFIG) libkms --silence-errors --cflags-only-I) \ + $(shell $(PKG_CONFIG) --cflags-only-I pixman-1 xorg-server libdrm xproto dri2proto) \ -I$(TOP)/src/gallium/include \ -I$(TOP)/src/gallium/auxiliary \ -I$(TOP)/include \ diff --git a/src/gallium/state_trackers/xorg/xvmc/Makefile b/src/gallium/state_trackers/xorg/xvmc/Makefile index 126dc6d58f1..c4680995c66 100644 --- a/src/gallium/state_trackers/xorg/xvmc/Makefile +++ b/src/gallium/state_trackers/xorg/xvmc/Makefile @@ -4,7 +4,7 @@ include $(TOP)/configs/current LIBNAME = xvmctracker LIBRARY_INCLUDES = \ - $(shell pkg-config --cflags-only-I xvmc) \ + $(shell $(PKG_CONFIG) --cflags-only-I xvmc) \ -I$(TOP)/src/gallium/winsys/g3dvl C_SOURCES = block.c \ |