Re: Toplevel configure script

You're using Elmer Fudd's GetWineX script for updating an existing CVS tree
aren't you? There have been lots of reports of this problem on IRC. So far
people have fixed them by manually fixing the merge issue.

It may be easier to do:

% mv configure configure.old
% cvs update configure

Or just check out and build a brand new tree.

rob

On Sun, 11 Jan 2004, Bryan Kadzban wrote:
> Ove Kaaven wrote:
> > Could you perhaps be more specific about what this W.XYZ revision is,
> > since the above stuff does not seem to exist in the current
> > configure revision in CVS?
> > 
> 
> Really?  Interesting... maybe it's my copy of cvs -- I'm using 1.11.11.
> I don't suppose there are known problems with it, are there?  It seems
> to happen with 1.11.9 also, on my other system, so maybe not.
> 
> The first instance starts on line 2339.  In that case (which is the
> nested one), the outside w.xyz is 1.282 (I assume that's a CVS revision
> number, but I'm not positive on that).  The nested <<<<<< starts on line
> 2341, and the w.xyz for it is 1.283 (apparently one CVS revision after,
> if those are indeed CVS revision numbers).  The outside one ends on line
> 2356, and the inside one ends on line 2349.
> 
> The second instance starts on line 2358, and ends on line 2361.  w.xyz
> in that case is also 1.282.
> 
> All three of those are inside one test (which looks like it's trying to
> decide what prototype to use for exit(), or something).
> 
> The third instance starts on line 14585 and ends on line 14589.  w.xyz
> is (again) 1.282.  At that point, the configure script is setting up the
> variable ac_config_files -- and the lines are really long.
> 
> As a sanity check on my end, I just did a "cvs up configure" (thinking
> maybe it had gotten fixed between the time I said something and the time
> you looked), but that didn't change anything.
> 
> Thanks for looking at it so fast, BTW.  :-)
> _______________________________________________
> winex-devel mailing list
> [email protected]
> http://lists.transgaming.org/cgi-bin/mailman/listinfo/winex-devel
>