On Mon, Dec 22, 2008 at 2:31 PM, Dan Nicholson <dbn.li...@gmail.com> wrote: > 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.li...@gmail.com> > --- > Jeremy, does this look OK for xquartz? I didn't know if you guys were > actually still using the raw mesa sources or not, but guessed that you > weren't. > > configure.ac | 4 ---- > hw/dmx/glxProxy/Makefile.am | 3 --- > hw/xfree86/dri/Makefile.am | 2 -- > hw/xquartz/GL/Makefile.am | 2 -- > 4 files changed, 0 insertions(+), 11 deletions(-)
Ping. Jeremy, I'm gonna push this if you don't have a problem with it. > > diff --git a/configure.ac b/configure.ac > index e467c10..bc9a7b9 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -518,9 +518,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" ]) > @@ -843,7 +840,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 f995498..8516048 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 \ > - -...@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 9bc8fab..a7b491c 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 8f4478f..9b61305 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 > -- > 1.5.6.5 > > _______________________________________________ xorg mailing list xorg@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/xorg