Kill off --with-mesa-source completely
There were a few spots left in the source that were using the --with-mesa-source defined headers or the now removed $(top_srcdir)/GL directory. These aren't needed anymore as all the necessary source for GLX is in $(top_srcdir)/glx. Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
This commit is contained in:
parent
e1c8ee2157
commit
64f924fbf5
|
@ -517,9 +517,6 @@ AC_ARG_ENABLE(visibility, AC_HELP_STRING([--enable-visibility], [Enable symb
|
||||||
[SYMBOL_VISIBILITY=auto])
|
[SYMBOL_VISIBILITY=auto])
|
||||||
|
|
||||||
dnl GLX build options
|
dnl GLX build options
|
||||||
AC_ARG_WITH(mesa-source, AS_HELP_STRING([--with-mesa-source=MESA_SOURCE], [Path to Mesa source tree]),
|
|
||||||
[ MESA_SOURCE="$withval" ],
|
|
||||||
[ MESA_SOURCE="" ])
|
|
||||||
AC_ARG_WITH(dri-driver-path, AS_HELP_STRING([--with-dri-driver-path=PATH], [Path to DRI drivers (default: ${libdir}/dri)]),
|
AC_ARG_WITH(dri-driver-path, AS_HELP_STRING([--with-dri-driver-path=PATH], [Path to DRI drivers (default: ${libdir}/dri)]),
|
||||||
[ DRI_DRIVER_PATH="$withval" ],
|
[ DRI_DRIVER_PATH="$withval" ],
|
||||||
[ DRI_DRIVER_PATH="${libdir}/dri" ])
|
[ DRI_DRIVER_PATH="${libdir}/dri" ])
|
||||||
|
@ -844,7 +841,6 @@ else
|
||||||
GLX=no
|
GLX=no
|
||||||
fi
|
fi
|
||||||
AM_CONDITIONAL(GLX, test "x$GLX" = xyes)
|
AM_CONDITIONAL(GLX, test "x$GLX" = xyes)
|
||||||
AC_SUBST([MESA_SOURCE])
|
|
||||||
|
|
||||||
if test "x$AIGLX" = xyes -a "x$GLX" = xyes -a "x$DRI" = xyes; then
|
if test "x$AIGLX" = xyes -a "x$GLX" = xyes -a "x$DRI" = xyes; then
|
||||||
AC_DEFINE(AIGLX, 1, [Build AIGLX loader])
|
AC_DEFINE(AIGLX, 1, [Build AIGLX loader])
|
||||||
|
|
|
@ -36,9 +36,6 @@ AM_CFLAGS = \
|
||||||
$(DIX_CFLAGS) \
|
$(DIX_CFLAGS) \
|
||||||
-I$(top_srcdir)/hw/dmx \
|
-I$(top_srcdir)/hw/dmx \
|
||||||
-I$(top_srcdir)/include \
|
-I$(top_srcdir)/include \
|
||||||
-I$(top_srcdir)/GL/include \
|
|
||||||
-I$(top_builddir)/GL/include \
|
|
||||||
-I@MESA_SOURCE@/include \
|
|
||||||
-DHAVE_DMX_CONFIG_H \
|
-DHAVE_DMX_CONFIG_H \
|
||||||
@DMXMODULES_CFLAGS@ \
|
@DMXMODULES_CFLAGS@ \
|
||||||
-I$(top_srcdir)/hw/xfree86/os-support
|
-I$(top_srcdir)/hw/xfree86/os-support
|
||||||
|
|
|
@ -8,8 +8,6 @@ libdri_la_CFLAGS = -I$(top_srcdir)/hw/xfree86/common \
|
||||||
-I$(top_srcdir)/hw/xfree86/ramdac \
|
-I$(top_srcdir)/hw/xfree86/ramdac \
|
||||||
-I$(top_srcdir)/hw/xfree86/os-support/bus \
|
-I$(top_srcdir)/hw/xfree86/os-support/bus \
|
||||||
-I$(top_srcdir)/glx \
|
-I$(top_srcdir)/glx \
|
||||||
-I$(top_srcdir)/GL/include \
|
|
||||||
-I$(top_builddir)/GL/include \
|
|
||||||
-DHAVE_XORG_CONFIG_H \
|
-DHAVE_XORG_CONFIG_H \
|
||||||
@DIX_CFLAGS@ @XORG_CFLAGS@ @DRIPROTO_CFLAGS@ \
|
@DIX_CFLAGS@ @XORG_CFLAGS@ @DRIPROTO_CFLAGS@ \
|
||||||
@LIBDRM_CFLAGS@ \
|
@LIBDRM_CFLAGS@ \
|
||||||
|
|
|
@ -3,8 +3,6 @@ AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS)
|
||||||
AM_CPPFLAGS = \
|
AM_CPPFLAGS = \
|
||||||
-I$(top_srcdir) \
|
-I$(top_srcdir) \
|
||||||
-I$(top_srcdir)/glx \
|
-I$(top_srcdir)/glx \
|
||||||
-I$(top_srcdir)/GL/include \
|
|
||||||
-I$(top_srcdir)/GL/mesa/glapi \
|
|
||||||
-I$(top_srcdir)/hw/xquartz \
|
-I$(top_srcdir)/hw/xquartz \
|
||||||
-I$(top_srcdir)/hw/xquartz/xpr \
|
-I$(top_srcdir)/hw/xquartz/xpr \
|
||||||
-I$(top_srcdir)/miext/damage
|
-I$(top_srcdir)/miext/damage
|
||||||
|
|
Loading…
Reference in New Issue
Block a user