Don't reuse PKG_CHECK_MODULES identifiers
Using GL for the PKG_CHECK_MODULES identifier multiple times means only the first call will actually be used. Later calls will be skipped due to GL_CFLAGS and GL_LIBS already being set. This changes DRI to using a different identifier and DMX to just reusing GL_CFLAGS. Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
This commit is contained in:
parent
ca46c01869
commit
e1c8ee2157
|
@ -863,9 +863,8 @@ AM_CONDITIONAL(DRI, test "x$DRI" = xyes)
|
||||||
if test "x$DRI" = xyes; then
|
if test "x$DRI" = xyes; then
|
||||||
AC_DEFINE(XF86DRI, 1, [Build DRI extension])
|
AC_DEFINE(XF86DRI, 1, [Build DRI extension])
|
||||||
PKG_CHECK_MODULES([DRIPROTO], [xf86driproto])
|
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(DRIPROTO_CFLAGS)
|
||||||
AC_SUBST(GL_CFLAGS)
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
PKG_CHECK_MODULES([DRI2PROTO], [dri2proto >= 1.99.3],
|
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>
|
dnl Linux sources in DMX require <linux/keyboard.h>
|
||||||
AC_CHECK_HEADER([linux/keyboard.h], DMX_BUILD_LNX="yes",
|
AC_CHECK_HEADER([linux/keyboard.h], DMX_BUILD_LNX="yes",
|
||||||
DMX_BUILD_LNX="no")
|
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])
|
PKG_CHECK_MODULES([XDMXCONFIG_DEP], [xaw7 xmu xt xpm x11])
|
||||||
AC_SUBST(XDMXCONFIG_DEP_CFLAGS)
|
AC_SUBST(XDMXCONFIG_DEP_CFLAGS)
|
||||||
AC_SUBST(XDMXCONFIG_DEP_LIBS)
|
AC_SUBST(XDMXCONFIG_DEP_LIBS)
|
||||||
|
|
|
@ -7,6 +7,7 @@ noinst_LTLIBRARIES = libglx.la $(GLXDRI_LIBRARY)
|
||||||
AM_CFLAGS = \
|
AM_CFLAGS = \
|
||||||
@DIX_CFLAGS@ \
|
@DIX_CFLAGS@ \
|
||||||
@GL_CFLAGS@ \
|
@GL_CFLAGS@ \
|
||||||
|
@DRI_CFLAGS@ \
|
||||||
@XLIB_CFLAGS@ \
|
@XLIB_CFLAGS@ \
|
||||||
@LIBDRM_CFLAGS@ \
|
@LIBDRM_CFLAGS@ \
|
||||||
@DRIPROTO_CFLAGS@ \
|
@DRIPROTO_CFLAGS@ \
|
||||||
|
|
|
@ -11,8 +11,7 @@ if GLX
|
||||||
SUBDIRS += glxProxy
|
SUBDIRS += glxProxy
|
||||||
GLX_LIBS = glxProxy/libglxproxy.a
|
GLX_LIBS = glxProxy/libglxproxy.a
|
||||||
GLX_SRCS = $(PANORAMIX_SRCS) dmx_glxvisuals.c dmx_glxvisuals.h
|
GLX_SRCS = $(PANORAMIX_SRCS) dmx_glxvisuals.c dmx_glxvisuals.h
|
||||||
GLX_INCS = -I$(top_srcdir)/hw/xfree86/dixmods/extmod \
|
GLX_INCS = -I$(top_srcdir)/hw/xfree86/dixmods/extmod
|
||||||
-I@MESA_SOURCE@/include
|
|
||||||
GLX_DEFS = @GL_CFLAGS@
|
GLX_DEFS = @GL_CFLAGS@
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -22,14 +22,12 @@ libdmxconfig_a_SOURCES = $(LIBSRCS)
|
||||||
|
|
||||||
if GLX
|
if GLX
|
||||||
GLX_DEFS = @GL_CFLAGS@
|
GLX_DEFS = @GL_CFLAGS@
|
||||||
GLX_INCS = -I@MESA_SOURCE@/include
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
AM_YFLAGS = -d
|
AM_YFLAGS = -d
|
||||||
AM_CFLAGS = \
|
AM_CFLAGS = \
|
||||||
$(DIX_CFLAGS) \
|
$(DIX_CFLAGS) \
|
||||||
-I$(top_srcdir)/hw/dmx \
|
-I$(top_srcdir)/hw/dmx \
|
||||||
$(GLX_INCS) \
|
|
||||||
-DHAVE_DMX_CONFIG_H \
|
-DHAVE_DMX_CONFIG_H \
|
||||||
-DDMX_LOG_STANDALONE \
|
-DDMX_LOG_STANDALONE \
|
||||||
$(GLX_DEFS) \
|
$(GLX_DEFS) \
|
||||||
|
|
|
@ -58,12 +58,10 @@ libdmxinput_a_SOURCES = ChkNotMaskEv.c \
|
||||||
|
|
||||||
if GLX
|
if GLX
|
||||||
GLX_DEFS = @GL_CFLAGS@
|
GLX_DEFS = @GL_CFLAGS@
|
||||||
GLX_INCS = -I@MESA_SOURCE@/include
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
AM_CFLAGS = $(DIX_CFLAGS) \
|
AM_CFLAGS = $(DIX_CFLAGS) \
|
||||||
-I$(top_srcdir)/hw/dmx \
|
-I$(top_srcdir)/hw/dmx \
|
||||||
$(GLX_INCS) \
|
|
||||||
-DHAVE_DMX_CONFIG_H \
|
-DHAVE_DMX_CONFIG_H \
|
||||||
$(GLX_DEFS) \
|
$(GLX_DEFS) \
|
||||||
@DMXMODULES_CFLAGS@
|
@DMXMODULES_CFLAGS@
|
||||||
|
|
|
@ -13,7 +13,7 @@ libdri_la_CFLAGS = -I$(top_srcdir)/hw/xfree86/common \
|
||||||
-DHAVE_XORG_CONFIG_H \
|
-DHAVE_XORG_CONFIG_H \
|
||||||
@DIX_CFLAGS@ @XORG_CFLAGS@ @DRIPROTO_CFLAGS@ \
|
@DIX_CFLAGS@ @XORG_CFLAGS@ @DRIPROTO_CFLAGS@ \
|
||||||
@LIBDRM_CFLAGS@ \
|
@LIBDRM_CFLAGS@ \
|
||||||
@GL_CFLAGS@
|
@DRI_CFLAGS@
|
||||||
libdri_la_LDFLAGS = -module -avoid-version @LIBDRM_LIBS@
|
libdri_la_LDFLAGS = -module -avoid-version @LIBDRM_LIBS@
|
||||||
libdri_ladir = $(moduledir)/extensions
|
libdri_ladir = $(moduledir)/extensions
|
||||||
libdri_la_SOURCES = \
|
libdri_la_SOURCES = \
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
libdri2_la_LTLIBRARIES = libdri2.la
|
libdri2_la_LTLIBRARIES = libdri2.la
|
||||||
libdri2_la_CFLAGS = \
|
libdri2_la_CFLAGS = \
|
||||||
-DHAVE_XORG_CONFIG_H \
|
-DHAVE_XORG_CONFIG_H \
|
||||||
@GL_CFLAGS@ \
|
@DRI_CFLAGS@ \
|
||||||
@DIX_CFLAGS@ @XORG_CFLAGS@ @DRI2PROTO_CFLAGS@ @LIBDRM_CFLAGS@ \
|
@DIX_CFLAGS@ @XORG_CFLAGS@ @DRI2PROTO_CFLAGS@ @LIBDRM_CFLAGS@ \
|
||||||
-I$(top_srcdir)/hw/xfree86/common \
|
-I$(top_srcdir)/hw/xfree86/common \
|
||||||
-I$(top_srcdir)/hw/xfree86/os-support/bus
|
-I$(top_srcdir)/hw/xfree86/os-support/bus
|
||||||
|
|
Loading…
Reference in New Issue
Block a user