diff options
| author | Dan Nicholson <dbn.lists@gmail.com> | 2008-12-22 13:43:30 -0800 |
|---|---|---|
| committer | Dan Nicholson <dbn.lists@gmail.com> | 2009-01-18 09:49:06 -0800 |
| commit | 64f924fbf513b5f91b3f2bcf5767f6fe927d3f7a (patch) | |
| tree | 3746dbd5193c12aafa975eb9c42eea59da33264e | |
| parent | e1c8ee215797fa8c6a3a5421bb6f99b58064248b (diff) | |
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>
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | hw/dmx/glxProxy/Makefile.am | 3 | ||||
| -rw-r--r-- | hw/xfree86/dri/Makefile.am | 2 | ||||
| -rw-r--r-- | hw/xquartz/GL/Makefile.am | 2 |
4 files changed, 0 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index c2831ed74..dec931908 100644 --- a/configure.ac +++ b/configure.ac @@ -517,9 +517,6 @@ AC_ARG_ENABLE(visibility, AC_HELP_STRING([--enable-visibility], [Enable symb [SYMBOL_VISIBILITY=auto]) 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)]), [ DRI_DRIVER_PATH="$withval" ], [ DRI_DRIVER_PATH="${libdir}/dri" ]) @@ -844,7 +841,6 @@ else GLX=no fi 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 AC_DEFINE(AIGLX, 1, [Build AIGLX loader]) diff --git a/hw/dmx/glxProxy/Makefile.am b/hw/dmx/glxProxy/Makefile.am index f99549817..851604883 100644 --- a/hw/dmx/glxProxy/Makefile.am +++ b/hw/dmx/glxProxy/Makefile.am @@ -36,9 +36,6 @@ AM_CFLAGS = \ $(DIX_CFLAGS) \ -I$(top_srcdir)/hw/dmx \ -I$(top_srcdir)/include \ - -I$(top_srcdir)/GL/include \ - -I$(top_builddir)/GL/include \ - -I@MESA_SOURCE@/include \ -DHAVE_DMX_CONFIG_H \ @DMXMODULES_CFLAGS@ \ -I$(top_srcdir)/hw/xfree86/os-support diff --git a/hw/xfree86/dri/Makefile.am b/hw/xfree86/dri/Makefile.am index 9bc8fab0c..a7b491c6e 100644 --- a/hw/xfree86/dri/Makefile.am +++ b/hw/xfree86/dri/Makefile.am @@ -8,8 +8,6 @@ libdri_la_CFLAGS = -I$(top_srcdir)/hw/xfree86/common \ -I$(top_srcdir)/hw/xfree86/ramdac \ -I$(top_srcdir)/hw/xfree86/os-support/bus \ -I$(top_srcdir)/glx \ - -I$(top_srcdir)/GL/include \ - -I$(top_builddir)/GL/include \ -DHAVE_XORG_CONFIG_H \ @DIX_CFLAGS@ @XORG_CFLAGS@ @DRIPROTO_CFLAGS@ \ @LIBDRM_CFLAGS@ \ diff --git a/hw/xquartz/GL/Makefile.am b/hw/xquartz/GL/Makefile.am index 8f4478fec..9b61305d6 100644 --- a/hw/xquartz/GL/Makefile.am +++ b/hw/xquartz/GL/Makefile.am @@ -3,8 +3,6 @@ AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS) AM_CPPFLAGS = \ -I$(top_srcdir) \ -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/xpr \ -I$(top_srcdir)/miext/damage |