diff -ruN mjpegtools-1.6.1.orig/configure mjpegtools-1.6.1/configure
--- mjpegtools-1.6.1.orig/configure	Mon Dec  9 05:58:05 2002
+++ mjpegtools-1.6.1/configure	Fri Aug 15 12:43:05 2003
@@ -6382,7 +6382,7 @@
     # FIXME: Relying on posixy $() will cause problems for
     #        cross-compilation, but unfortunately the echo tests do not
     #        yet detect zsh echo's removal of \ escapes.
-    archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring'
+    archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags $(test "x$module" != xyes && echo -install_name $rpath/$soname $verstring)'
     # We need to add '_' to the symbols in $export_symbols first
     #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
     hardcode_direct=yes
diff -ruN mjpegtools-1.6.1.orig/lavtools/Makefile.in mjpegtools-1.6.1/lavtools/Makefile.in
--- mjpegtools-1.6.1.orig/lavtools/Makefile.in	Mon Dec  9 05:58:01 2002
+++ mjpegtools-1.6.1/lavtools/Makefile.in	Fri Aug 15 12:42:19 2003
@@ -161,7 +161,6 @@
 
 LAV_ALL_LIB_OPTS = \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-	-release $(LT_RELEASE) \
 	-export-dynamic 
 
 
diff -ruN mjpegtools-1.6.1.orig/mplex/multplex.cc mjpegtools-1.6.1/mplex/multplex.cc
--- mjpegtools-1.6.1.orig/mplex/multplex.cc	Mon Apr 29 08:36:00 2002
+++ mjpegtools-1.6.1/mplex/multplex.cc	Fri Aug 15 12:14:07 2003
@@ -8,6 +8,8 @@
 #include <mjpeg_logging.h>
 #include <format_codes.h>
 
+#include <assert.h>
+
 #include "interact.hh"
 #include "videostrm.hh"
 #include "outputstream.hh"
diff -ruN mjpegtools-1.6.1.orig/mplex/stillsstream.cc mjpegtools-1.6.1/mplex/stillsstream.cc
--- mjpegtools-1.6.1.orig/mplex/stillsstream.cc	Wed Apr 17 22:32:02 2002
+++ mjpegtools-1.6.1/mplex/stillsstream.cc	Fri Aug 15 12:31:42 2003
@@ -22,6 +22,7 @@
 
 
 #include <format_codes.h>
+#include <assert.h>
 
 #include "stillsstream.hh"
 #include "interact.hh"
diff -ruN mjpegtools-1.6.1.orig/mplex/systems.cc mjpegtools-1.6.1/mplex/systems.cc
--- mjpegtools-1.6.1.orig/mplex/systems.cc	Mon Apr 29 08:36:01 2002
+++ mjpegtools-1.6.1/mplex/systems.cc	Fri Aug 15 12:26:50 2003
@@ -4,6 +4,9 @@
 #include <string.h>
 #include <sys/param.h>
 #include <sys/stat.h>
+
+#include <assert.h>
+
 #include "systems.hh"
 #include "mplexconsts.hh"