configure fails - >>>>> <<<<< =====

[Rafal Szczesniak]

On Fri, 22 Mar 2002, David Shapiro wrote:

> Hello,
> 
> I just got the latest cvs, but configure fails on lines with things like:
> 
> >>>>>>> 1.273
> =======
> <<<<<<< configure
> 
> I used:
> 
> 
> env CFLAGS="-Wall" ./configure --with-smbmount --with-automount
> --enable-debug --with-winbind && make proto && make
> 
> Is it the -Wall option or something causing this?

Nope. It's cvs update with differences between cvs repo and your files. 
Remove "configure" file, and issue "autoconf" command. This operation will
recreate (valid) configure file.


cheers,
+------------------------------------------------------------+
|Rafal 'Mimir' Szczesniak <mimir at diament.ists.pwr.wroc.pl>   |
|*BSD, GNU/Linux and Samba                                  /
|__________________________________________________________/