There appears to be have been a merge error with the latest
configure.in changes.  Down at lines 472-485, the file contains
this  (I'll put in the annotated diff):

472 cypher 1.70 <<<<<<< configure.in
473             have_nasm=no
474             AC_CHECK_PROG(have_nasm, nasm, yes, no)
475             =======

476 kabi   1.69 AC_CHECK_PROGS(test_have_nasm, nasm, "")

477 cypher 1.70 >>>>>>> 1.69

478 cypher 1.67

479 cypher 1.70 <<<<<<< configure.in
480             if test x$have_nasm != xyes; then
481                 use_ffmpeg=no
482             =======

483 kabi   1.69 if test -z "$test_have_nasm"; then

484 cypher 1.67 use_ffmpeg=0

485 cypher 1.70 >>>>>>> 1.69

Apparently the diff and merge process went wrong when updating
this file.  There's an obvious manual fix (delete the old parts
that should be excised, leaving the new 1.70 stuff), but it would
be nice to fix it in CVS.

John


_______________________________________________
Avifile mailing list
[EMAIL PROTECTED]
http://prak.org/mailman/listinfo/avifile

Reply via email to