diff options
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | hw/xfree86/dri/Makefile.am | 2 | ||||
| -rw-r--r-- | hw/xfree86/os-support/linux/drm/Makefile.am | 6 |
3 files changed, 8 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 410c8b664..d99d005ad 100644 --- a/configure.ac +++ b/configure.ac @@ -392,7 +392,8 @@ AM_CONDITIONAL(DRI, test x$DRI = xyes) if test "$DRI" = yes; then AC_DEFINE(XORGDRI,1,[Build DRI extension]) AC_DEFINE(_XORGDRI_SERVER_,1,[XORGDRI internal define]) - REQUIRED_MODULES="$REQUIRED_MODULES xf86driproto" + PKG_CHECK_MODULES([DRIPROTO], [xf86driproto]) + AC_SUBST(DRIPROTO_CFLAGS) fi AC_DEFINE(XINPUT,1,[Support X Input extension]) EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/Xi/libXi.la' diff --git a/hw/xfree86/dri/Makefile.am b/hw/xfree86/dri/Makefile.am index 95fcfebab..1dc08064c 100644 --- a/hw/xfree86/dri/Makefile.am +++ b/hw/xfree86/dri/Makefile.am @@ -1,5 +1,5 @@ libdri_la_LTLIBRARIES = libdri.la -libdri_la_CFLAGS = -I$(top_srcdir)/hw/xfree86/common -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/GL/glx/ -I$(top_srcdir)/GL/include -DXF86DRI -DXORG_VERSION_CURRENT=\"100\" +libdri_la_CFLAGS = -I$(top_srcdir)/hw/xfree86/common -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/GL/glx/ -I$(top_srcdir)/GL/include -DXF86DRI -DXORG_VERSION_CURRENT=\"100\" @DRIPROTO_CFLAGS@ libdri_la_LDFLAGS = -module -avoid-version libdri_ladir = @moduledir@/extensions libdri_la_SOURCES = \ diff --git a/hw/xfree86/os-support/linux/drm/Makefile.am b/hw/xfree86/os-support/linux/drm/Makefile.am index 0be0ccba3..3410b5cf3 100644 --- a/hw/xfree86/os-support/linux/drm/Makefile.am +++ b/hw/xfree86/os-support/linux/drm/Makefile.am @@ -1,4 +1,8 @@ -INCLUDES = -I$(srcdir)/../../shared/drm/kernel +INCLUDES = -I$(srcdir)/../../shared/drm/kernel \ + -I$(srcdir)/../.. \ + -I$(srcdir)/../../bus \ + -I$(srcdir)/../../../dri \ + -I$(srcdir)/../../../common sdklibdir = $(libdir)/xorg sdklib_LIBRARIES = libxorglinuxdrm.a |