xserver/xorg build problems

[Alan Coopersmith]

Adam Jackson wrote:
> Assuming you want GL support, check out Mesa from CVS and tell autogen about 
> it with --with-mesa-source=/path/to/source.  If you don't, then don't, and 
> the build should disable GLX support.
> 
> If you're not specifying a Mesa path and it still fails to build, that's a new 
> failure, and I'd appreciate seeing the log for it.

I have to specify --disable-GL to make it build without Mesa installed.
If I don't specify that it goes into glx and dies trying to build g_disptab.c
since it can't find GL/gl.h

It looks like this patch makes it work by setting the automake conditional
after checking for Mesa source:

--- xorg/configure.ac   16 Jul 2005 16:30:40 -0000      1.25
+++ xorg/configure.ac   17 Jul 2005 00:49:12 -0000
@@ -381,18 +381,18 @@
  AM_CONDITIONAL(XCSECURITY, [test x$XCSECURITY = xyes])
  if test "$XCSECURITY" = yes; then
         AC_DEFINE(XCSECURITY,1,[Build Security extension])
  fi

-AM_CONDITIONAL(GLX, test x$GLX = xyes)
  if test "$GLX" = yes -a x$MESA_SOURCE != x; then
         AC_DEFINE(GLXEXT,1,[Build GLX extension])
  #      EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/GL/glx/libglx.la 
$(top_builddir)/GL/mesa/libGLcore.la'
         dnl EXTENSION_INCS="$EXTENSION_INCS "'-I$(top_srcdir)/glx'
  else
          GLX=no
  fi
+AM_CONDITIONAL(GLX, test x$GLX = xyes)
  AC_SUBST([MESA_SOURCE])

  AM_CONDITIONAL(DRI, test x$DRI = xyes)
  if test "$DRI" = yes; then
         AC_DEFINE(XF86DRI,1,[Build DRI extension])

-- 
	-Alan Coopersmith-           alan.coopersmith at sun.com
	 Sun Microsystems, Inc. - X Window System Engineering