[xorg-server] autogen.sh fails after last update.

[Alan Coopersmith]

Thanks for catching both these mistakes - I've committed the fixes for them
now.

As for the SUBDIRS, there are dependencies between some of them that require
certain ordering - I know for instance scanpci, dummy & os-support all have
to come before utils since some of the utils link with them (which is one of 
the reasons they still live in the xserver/xorg module instead of being broken 
out).   I don't know all the other inter-dependencies though.

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


Dawid Gajownik wrote:
> Hi!
> 
>     That's me again ;-) After `cvs -f update' autogen.sh fails:
> 
> [y4kk0 at X xorg]$ ./autogen.sh
> autoreconf: Entering directory `.'
> autoreconf: configure.ac: not using Gettext
> autoreconf: running: aclocal
> NONE:0: /usr/bin/m4: ERROR: EOF in string
> autom4te: /usr/bin/m4 failed with exit status: 1
> aclocal: autom4te failed with exit status: 1
> autoreconf: aclocal failed with exit status: 1
> [y4kk0 at X xorg]$
> 
> It seems that in this patch → 
> http://cvs.freedesktop.org/xorg/xserver/xorg/configure.ac?r1=1.95&r2=1.96 
> there is missing bracket. BTW should there be AC_CHECK_HEADER or 
> AC_CHECK_HEADERS macro? (sorry for the stupid question - I'm a GNU 
> Autotools newbie ;) ).
> 
> That's not all :D After running `make dist-bzip2' resulting tarball is 
> broken. When you run `configure' you will see:
> 
> [snip]
> 
> config.status: creating hw/xfree86/doc/sgml/Makefile
> config.status: creating hw/xfree86/dri/Makefile
> config.status: creating hw/xfree86/dummylib/Makefile
> config.status: creating hw/xfree86/exa/Makefile
> config.status: creating hw/xfree86/fbdevhw/Makefile
> config.status: creating hw/xfree86/getconfig/Makefile
> config.status: error: cannot find input file: 
> hw/xfree86/getconfig/Makefile.in
> [y4kk0 at X xorg-server-0.99.1]$
> 
> I've attached patches. I have one more question: does the order in 
> SUBDIRS and DIST_SUBDIRS variables (file 
> xserver/xorg/hw/xfree86/Makefile.am) is important? If not, maybe it 
> would be better to put all dirs in alphabetical order?
> 
> Regards,
>     Dawid
> 
> 
> ------------------------------------------------------------------------
> 
> Index: configure.ac
> ===================================================================
> RCS file: /cvs/xorg/xserver/xorg/configure.ac,v
> retrieving revision 1.96
> diff -u -p -r1.96 configure.ac
> --- configure.ac	3 Oct 2005 06:31:48 -0000	1.96
> +++ configure.ac	3 Oct 2005 10:15:26 -0000
> @@ -158,7 +158,7 @@ AC_CHECK_HEADER([execinfo.h],[
>      AC_CHECK_LIB(c, backtrace, [
>          AC_DEFINE(HAVE_BACKTRACE, 1, [Has backtrace support])
>      ])
> -)
> +])
>  
>  dnl ---------------------------------------------------------------------------
>  dnl Bus options and CPU capabilities.  Replaces logic in
> 
> 
> ------------------------------------------------------------------------
> 
> Index: Makefile.am
> ===================================================================
> RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/Makefile.am,v
> retrieving revision 1.21
> diff -u -p -r1.21 Makefile.am
> --- Makefile.am	27 Sep 2005 14:09:31 -0000	1.21
> +++ Makefile.am	3 Oct 2005 10:14:36 -0000
> @@ -10,12 +10,12 @@ endif
>  SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support parser rac \
>            ramdac shadowfb vbe vgahw xaa xf1bpp xf4bpp xf8_16bpp \
>  	  xf8_32bpp xf8_32wid loader scanpci dixmods exa $(DRI_SUBDIR) utils \
> -	  $(DOC_SUBDIR)
> +	  $(DOC_SUBDIR) getconfig
>  
>  DIST_SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support \
>                 parser rac ramdac shadowfb vbe vgahw xaa xf1bpp xf4bpp \
>                 xf8_16bpp xf8_32bpp xf8_32wid loader scanpci dixmods dri exa \
> -	       utils doc
> +	       utils doc getconfig
>  
>  bin_PROGRAMS = Xorg
>  
> 
> 
> ------------------------------------------------------------------------
> 
> _______________________________________________
> xorg-modular mailing list
> xorg-modular at lists.x.org
> http://lists.x.org/mailman/listinfo/xorg-modular