CVS Update: xserver (branch: server-1_0-branch)

[Eric Anholt]

CVSROOT:	/cvs/xorg
Module name:	xserver
Changes by:	anholt at kemper.freedesktop.org	06/03/14 19:47:10

Log message:
  Merge from HEAD:
  Define NO_LIBCWRAPPER in dix-config.h, and rely on Mesa including
  dix-config.h if DIX_HAVE_CONFIG_H is defined to get it and _XSERVER64.

Modified files:
      xserver/xorg/:	Tag: server-1_0-branch
        ChangeLog configure.ac 
      xserver/xorg/GL/mesa/array_cache/:	Tag: server-1_0-branch
        Makefile.am 
      xserver/xorg/GL/mesa/glapi/:	Tag: server-1_0-branch
        Makefile.am 
      xserver/xorg/GL/mesa/main/:	Tag: server-1_0-branch
        Makefile.am 
      xserver/xorg/GL/mesa/math/:	Tag: server-1_0-branch
        Makefile.am 
      xserver/xorg/GL/mesa/shader/:	Tag: server-1_0-branch
        Makefile.am 
      xserver/xorg/GL/mesa/shader/grammar/:	Tag: server-1_0-branch
        Makefile.am 
      xserver/xorg/GL/mesa/shader/slang/:	Tag: server-1_0-branch
        Makefile.am 
      xserver/xorg/GL/mesa/swrast/:	Tag: server-1_0-branch
        Makefile.am 
      xserver/xorg/GL/mesa/swrast_setup/:	Tag: server-1_0-branch
        Makefile.am 
      xserver/xorg/GL/mesa/tnl/:	Tag: server-1_0-branch
        Makefile.am 
      xserver/xorg/include/:	Tag: server-1_0-branch
        dix-config.h.in 
  
  Revision      Changes    Path
  1.156.2.10    +18 -0     xserver/xorg/ChangeLog
  http://cvs.freedesktop.org/xorg/xserver/xorg/ChangeLog
  1.148.2.2     +1 -0      xserver/xorg/configure.ac
  http://cvs.freedesktop.org/xorg/xserver/xorg/configure.ac
  1.7.2.1       +1 -1      xserver/xorg/GL/mesa/array_cache/Makefile.am
  http://cvs.freedesktop.org/xorg/xserver/xorg/GL/mesa/array_cache/Makefile.am
  1.5.2.1       +1 -1      xserver/xorg/GL/mesa/glapi/Makefile.am
  http://cvs.freedesktop.org/xorg/xserver/xorg/GL/mesa/glapi/Makefile.am
  1.8.2.1       +1 -1      xserver/xorg/GL/mesa/main/Makefile.am
  http://cvs.freedesktop.org/xorg/xserver/xorg/GL/mesa/main/Makefile.am
  1.7.2.1       +1 -1      xserver/xorg/GL/mesa/math/Makefile.am
  http://cvs.freedesktop.org/xorg/xserver/xorg/GL/mesa/math/Makefile.am
  1.8.2.1       +1 -1      xserver/xorg/GL/mesa/shader/Makefile.am
  http://cvs.freedesktop.org/xorg/xserver/xorg/GL/mesa/shader/Makefile.am
  1.5.2.1       +1 -1      xserver/xorg/GL/mesa/shader/grammar/Makefile.am
  http://cvs.freedesktop.org/xorg/xserver/xorg/GL/mesa/shader/grammar/Makefile.am
  1.5.2.1       +1 -1      xserver/xorg/GL/mesa/shader/slang/Makefile.am
  http://cvs.freedesktop.org/xorg/xserver/xorg/GL/mesa/shader/slang/Makefile.am
  1.7.2.1       +1 -1      xserver/xorg/GL/mesa/swrast/Makefile.am
  http://cvs.freedesktop.org/xorg/xserver/xorg/GL/mesa/swrast/Makefile.am
  1.7.2.1       +1 -1      xserver/xorg/GL/mesa/swrast_setup/Makefile.am
  http://cvs.freedesktop.org/xorg/xserver/xorg/GL/mesa/swrast_setup/Makefile.am
  1.7.2.1       +1 -1      xserver/xorg/GL/mesa/tnl/Makefile.am
  http://cvs.freedesktop.org/xorg/xserver/xorg/GL/mesa/tnl/Makefile.am
  1.20.2.2      +3 -0      xserver/xorg/include/dix-config.h.in
  http://cvs.freedesktop.org/xorg/xserver/xorg/include/dix-config.h.in