[PULL] Kill libxorg

[Daniel Stone]

Hi,

On Mon, Jun 20, 2011 at 10:25:30AM +1000, Peter Hutterer wrote:
> On Fri, Jun 17, 2011 at 04:55:56PM -0700, Dan Nicholson wrote:
> > Here's a few commits that kill off the libxorg "convenience library of
> > convenience libraries". It provides a nice speedup when you're rebuilding
> > Xorg from only a couple local changes.
> 
> Despite a distclean && reconf, I cannot make this link on my machine.
> 
> ../../os/os.O: In function `AddEnabledDevice':
> /home/whot/xorg/xserver/os/connection.c:1057: multiple definition of
> `AddEnabledDevice'
> ../../os/os.O:/home/whot/xorg/xserver/os/connection.c:1057: first defined
> here
> ../../os/os.O: In function `CreateWellKnownSockets':
> /home/whot/xorg/xserver/os/connection.c:371: multiple definition of
> `CreateWellKnownSockets'
> ../../os/os.O:/home/whot/xorg/xserver/os/connection.c:371: first defined
> here
> ../../os/os.O: In function `AugmentSelf':
> /home/whot/xorg/xserver/os/access.c:806: multiple definition of
> `AugmentSelf'
> ../../os/os.O:/home/whot/xorg/xserver/os/access.c:806: first defined here
> collect2: ld returned 1 exit status
> 
> there are approximately 2314 more of these, but I'll skip them for brevity.
> Is this a problem on my side or a bug in the patchset?

Hmm, from os.O, I'm assuming this is a problem with the dtrace hooks.
Does the problem go away if you delete all the dtrace stuff from
os/Makefile.am, autoreconf, and try again?

Also, what version of automake are you on? It's fine for me with 1.11.1
from Debian sid.

Cheers,
Daniel