[Freeciv-Dev] Re: [FreeCiv-Cvs] thue: Update configure to insert -lm in server libs ...

[Christian Knoke <ChrisK@xxxxxxxx>]

Am Freitag,  1. Juni 2001 12:32 schrieben Sie:

> > Christian Knoke (ChrisK@xxxxxxxx) wrote:
> > checking for main in -lnls... ./configure: line 6360: syntax error
> > near unexpected token `<<<<<' ./configure: line 6360: `<<<<<<<
> > configure'
>
> Your CVS update did a partial merge (excuse the terminology, I don't
> know what it's really called).  This is typically caused by having a
> modified version of a file in your local tree, and then doing a CVS
> update which cannot merge the changes properly -- it leaves the file
> in a state where manual intervention is required.

No, there has been a preceding cvs call, which was incomplete.

>
> The best course of action for you is probably to remove the affected
> files (most likely configure and configure.in), redo the CVS update
> to get new copies of them, and try again.

Thanks, worked.

>
> Oh, and if you're playing with the auto* stuff, you probably want to
> remove config.cache too.

Christian

-- 
* Christian Knoke                           +49 4852 92248 *
* D-25541 Brunsbuettel                  Wurtleutetweute 49 *
* * * * * * * * *  Ceterum censeo Microsoft esse dividendum.