diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2010-02-05 13:55:32 -0500 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2010-02-05 13:55:45 -0500 |
| commit | 077bc2fda2afdbe0bf12e1baeafa4ce41b711d1d (patch) | |
| tree | f51160a826ffc112851718f68d0b438155b877e5 | |
| parent | e423df0f0c3e5a5d33d301b6176e9380e61b98ad (diff) | |
egl_dri2: Use pkg-config cflags and libs from configure output
Running pkg-config in Makefiles is bad form, since it doesn't respect the
PKG_CONFIG_PATH value set at ./configure time.
| -rw-r--r-- | configs/autoconf.in | 3 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/egl/drivers/dri2/Makefile | 5 |
3 files changed, 7 insertions, 5 deletions
diff --git a/configs/autoconf.in b/configs/autoconf.in index b0024ec689..30637877f3 100644 --- a/configs/autoconf.in +++ b/configs/autoconf.in @@ -153,3 +153,6 @@ GLW_PC_LIB_PRIV = @GLW_PC_LIB_PRIV@ GLW_PC_CFLAGS = @GLW_PC_CFLAGS@ OSMESA_PC_REQ = @OSMESA_PC_REQ@ OSMESA_PC_LIB_PRIV = @OSMESA_PC_LIB_PRIV@ + +EGL_DRI2_CFLAGS = @EGL_DRI2_CFLAGS@ +EGL_DRI2_LIBS = @EGL_DRI2_LIBS@ diff --git a/configure.ac b/configure.ac index af5a5fdc4b..b6c6535fc6 100644 --- a/configure.ac +++ b/configure.ac @@ -918,8 +918,8 @@ if test "x$enable_egl" = xyes; then fi # build egl_dri2 when xcb-dri2 is available - PKG_CHECK_EXISTS([x11-xcb xcb-dri2 xcb-xfixes], - [have_xcb_dri2=yes],[have_xcb_dri2=no]) + PKG_CHECK_MODULES([EGL_DRI2], [x11-xcb xcb-dri2 xcb-xfixes libdrm], + [have_xcb_dri2=yes],[have_xcb_dri2=no]) if test "$have_xcb_dri2" = yes; then EGL_DRIVERS_DIRS="$EGL_DRIVERS_DIRS dri2" fi diff --git a/src/egl/drivers/dri2/Makefile b/src/egl/drivers/dri2/Makefile index 95f9574531..129e67b8c6 100644 --- a/src/egl/drivers/dri2/Makefile +++ b/src/egl/drivers/dri2/Makefile @@ -11,9 +11,8 @@ EGL_INCLUDES = \ -I$(TOP)/src/egl/main \ -I$(TOP)/src/mesa \ -DDEFAULT_DRIVER_DIR=\"$(DRI_DRIVER_SEARCH_DIR)\" \ - $(shell pkg-config --cflags xcb-dri2 xcb-xfixes x11-xcb libdrm) + $(EGL_DRI2_CFLAGS) -EGL_CFLAGS = -EGL_LIBS = $(shell pkg-config --libs xcb-dri2 xcb-xfixes x11-xcb libdrm) +EGL_LIBS = $(EGL_DRI2_LIBS) include ../Makefile.template |