Server build fixes: composite and x86_64

[Donnie Berkholz]

Jürg Billeter wrote:
> Index: configure.ac
> ===================================================================
> RCS file: /cvs/xorg/xserver/xorg/configure.ac,v
> retrieving revision 1.45
> diff -u -r1.45 configure.ac
> --- configure.ac	5 Aug 2005 15:43:31 -0000	1.45
> +++ configure.ac	6 Aug 2005 16:18:19 -0000
> @@ -574,11 +574,6 @@
>  EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/damageext/libdamageext.la'
>  EXTENSION_INCS="$EXTENSION_INCS "'-I$(top_srcdir)/damageext'
>  
> -if test "$COMPOSITE" = yes; then
> -	EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/composite/libcomposite.la'" "'$(top_builddir)/miext/cw/libcw.la'
> -	EXTENSION_INCS="$EXTENSION_INCS "'-I$(top_srcdir)/composite'
> -fi
> -
>  DIX_LIB='$(top_builddir)/dix/libdix.la'
>  OS_LIB='$(top_builddir)/os/libos.la'
>  MI_LIB='$(top_builddir)/mi/libmi.la'
> @@ -598,6 +593,12 @@
>  XI_INC='-I$(top_srcdir)/Xi'
>  CORE_INCS='-I$(top_srcdir)/include -I$(top_builddir)/include'
>  
> +if test "$COMPOSITE" = yes; then
> +	EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/composite/libcomposite.la'
> +	DAMAGE_LIB="$DAMAGE_LIB "'$(top_builddir)/miext/cw/libcw.la'
> +	EXTENSION_INCS="$EXTENSION_INCS "'-I$(top_srcdir)/composite'" "'-I$(top_srcdir)/miext/cw'
> +fi
> +

Ah, I like your version a lot better than mine.

Donnie