diff options
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | glx/Makefile.am | 1 | ||||
| -rw-r--r-- | hw/dmx/Makefile.am | 5 | ||||
| -rw-r--r-- | hw/dmx/config/Makefile.am | 2 | ||||
| -rw-r--r-- | hw/dmx/input/Makefile.am | 2 | ||||
| -rw-r--r-- | hw/xfree86/dri/Makefile.am | 2 | ||||
| -rw-r--r-- | hw/xfree86/dri2/Makefile.am | 2 |
7 files changed, 6 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index 2cf1643c8..c2831ed74 100644 --- a/configure.ac +++ b/configure.ac @@ -863,9 +863,8 @@ AM_CONDITIONAL(DRI, test "x$DRI" = xyes) if test "x$DRI" = xyes; then AC_DEFINE(XF86DRI, 1, [Build DRI extension]) PKG_CHECK_MODULES([DRIPROTO], [xf86driproto]) - PKG_CHECK_MODULES([GL], [glproto >= 1.4.1 dri >= 7.1.0]) + PKG_CHECK_MODULES([DRI], [glproto >= 1.4.1 dri >= 7.1.0]) AC_SUBST(DRIPROTO_CFLAGS) - AC_SUBST(GL_CFLAGS) fi PKG_CHECK_MODULES([DRI2PROTO], [dri2proto >= 1.99.3], @@ -1646,9 +1645,6 @@ dnl USB sources in DMX require <linux/input.h> dnl Linux sources in DMX require <linux/keyboard.h> AC_CHECK_HEADER([linux/keyboard.h], DMX_BUILD_LNX="yes", DMX_BUILD_LNX="no") - if test "x$GLX" = xyes; then - PKG_CHECK_MODULES([GL], [glproto]) - fi PKG_CHECK_MODULES([XDMXCONFIG_DEP], [xaw7 xmu xt xpm x11]) AC_SUBST(XDMXCONFIG_DEP_CFLAGS) AC_SUBST(XDMXCONFIG_DEP_LIBS) diff --git a/glx/Makefile.am b/glx/Makefile.am index bec35bf21..2537db865 100644 --- a/glx/Makefile.am +++ b/glx/Makefile.am @@ -7,6 +7,7 @@ noinst_LTLIBRARIES = libglx.la $(GLXDRI_LIBRARY) AM_CFLAGS = \ @DIX_CFLAGS@ \ @GL_CFLAGS@ \ + @DRI_CFLAGS@ \ @XLIB_CFLAGS@ \ @LIBDRM_CFLAGS@ \ @DRIPROTO_CFLAGS@ \ diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am index 8457aea60..9d2778ae4 100644 --- a/hw/dmx/Makefile.am +++ b/hw/dmx/Makefile.am @@ -11,9 +11,8 @@ if GLX SUBDIRS += glxProxy GLX_LIBS = glxProxy/libglxproxy.a GLX_SRCS = $(PANORAMIX_SRCS) dmx_glxvisuals.c dmx_glxvisuals.h -GLX_INCS = -I$(top_srcdir)/hw/xfree86/dixmods/extmod \ - -I@MESA_SOURCE@/include -GLX_DEFS = @GL_CFLAGS@ +GLX_INCS = -I$(top_srcdir)/hw/xfree86/dixmods/extmod +GLX_DEFS = @GL_CFLAGS@ endif if BUILDDOCS diff --git a/hw/dmx/config/Makefile.am b/hw/dmx/config/Makefile.am index c31e04942..9fa7113be 100644 --- a/hw/dmx/config/Makefile.am +++ b/hw/dmx/config/Makefile.am @@ -22,14 +22,12 @@ libdmxconfig_a_SOURCES = $(LIBSRCS) if GLX GLX_DEFS = @GL_CFLAGS@ -GLX_INCS = -I@MESA_SOURCE@/include endif AM_YFLAGS = -d AM_CFLAGS = \ $(DIX_CFLAGS) \ -I$(top_srcdir)/hw/dmx \ - $(GLX_INCS) \ -DHAVE_DMX_CONFIG_H \ -DDMX_LOG_STANDALONE \ $(GLX_DEFS) \ diff --git a/hw/dmx/input/Makefile.am b/hw/dmx/input/Makefile.am index 8ea500316..47dbd967b 100644 --- a/hw/dmx/input/Makefile.am +++ b/hw/dmx/input/Makefile.am @@ -58,12 +58,10 @@ libdmxinput_a_SOURCES = ChkNotMaskEv.c \ if GLX GLX_DEFS = @GL_CFLAGS@ -GLX_INCS = -I@MESA_SOURCE@/include endif AM_CFLAGS = $(DIX_CFLAGS) \ -I$(top_srcdir)/hw/dmx \ - $(GLX_INCS) \ -DHAVE_DMX_CONFIG_H \ $(GLX_DEFS) \ @DMXMODULES_CFLAGS@ diff --git a/hw/xfree86/dri/Makefile.am b/hw/xfree86/dri/Makefile.am index 3ec30beec..9bc8fab0c 100644 --- a/hw/xfree86/dri/Makefile.am +++ b/hw/xfree86/dri/Makefile.am @@ -13,7 +13,7 @@ libdri_la_CFLAGS = -I$(top_srcdir)/hw/xfree86/common \ -DHAVE_XORG_CONFIG_H \ @DIX_CFLAGS@ @XORG_CFLAGS@ @DRIPROTO_CFLAGS@ \ @LIBDRM_CFLAGS@ \ - @GL_CFLAGS@ + @DRI_CFLAGS@ libdri_la_LDFLAGS = -module -avoid-version @LIBDRM_LIBS@ libdri_ladir = $(moduledir)/extensions libdri_la_SOURCES = \ diff --git a/hw/xfree86/dri2/Makefile.am b/hw/xfree86/dri2/Makefile.am index e5bd16bd2..c9fdde2f8 100644 --- a/hw/xfree86/dri2/Makefile.am +++ b/hw/xfree86/dri2/Makefile.am @@ -1,7 +1,7 @@ libdri2_la_LTLIBRARIES = libdri2.la libdri2_la_CFLAGS = \ -DHAVE_XORG_CONFIG_H \ - @GL_CFLAGS@ \ + @DRI_CFLAGS@ \ @DIX_CFLAGS@ @XORG_CFLAGS@ @DRI2PROTO_CFLAGS@ @LIBDRM_CFLAGS@ \ -I$(top_srcdir)/hw/xfree86/common \ -I$(top_srcdir)/hw/xfree86/os-support/bus |