diff -ru libquicktime-0.9.2pre1/configure libquicktime-0.9.2pre1-patched/configure
--- libquicktime-0.9.2pre1/configure	Wed Aug 14 22:49:04 2002
+++ libquicktime-0.9.2pre1-patched/configure	Fri Sep 20 11:42:27 2002
@@ -4608,7 +4608,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
@@ -7387,10 +7387,10 @@
 AS=gcc
 ASFLAGS=
 
-COMMON_CFLAGS=" -finline-functions -W -Wall -Wno-unused -Winline"
+COMMON_CFLAGS=" -finline-functions -W -Wall -Wno-unused -Winline $CFLAGS"
 PROFILE_CFLAGS=" -pg -fprofile-arcs -ftest-coverage"
 DEBUG_CFLAGS=" -g3"
-OPTIMIZE_CFLAGS=" -O3 -funroll-all-loops -fomit-frame-pointer -malign-loops=2 -malign-jumps=2 -malign-functions=2"
+OPTIMIZE_CFLAGS=" -O3 -funroll-all-loops -fomit-frame-pointer "
 
 # large file support
 COMMON_FLAGS="$COMMON_FLAGS -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
@@ -11082,8 +11082,8 @@
 OLD_CFLAGS=$CFLAGS
 OLD_LIBS=$LIBS
 
-LIBS=-ljpeg-mmx
-CFLAGS=""
+LIBS="-ljpeg-mmx $LIBS"
+#CFLAGS=""
 
 echo "$as_me:11088: checking for jpeg-mmx" >&5
 echo $ECHO_N "checking for jpeg-mmx... $ECHO_C" >&6
@@ -11123,8 +11123,8 @@
 if test x$have_libjpeg = xfalse; then
   echo "$as_me:11124: result: no" >&5
 echo "${ECHO_T}no" >&6;
-  LIBS=-ljpeg
-  CFLAGS=""
+  LIBS="-ljpeg $OLD_LIBS"
+#  CFLAGS=""
   echo "$as_me:11128: checking for libjpeg" >&5
 echo $ECHO_N "checking for libjpeg... $ECHO_C" >&6
   cat >conftest.$ac_ext <<_ACEOF
@@ -11254,7 +11254,7 @@
 OLD_LIBS=$LIBS
 
 LIBS="-lpng -lz"
-CFLAGS=""
+# CFLAGS=""
 
 echo "$as_me:11259: checking for libpng" >&5
 echo $ECHO_N "checking for libpng... $ECHO_C" >&6
diff -ru libquicktime-0.9.2pre1/configure.ac libquicktime-0.9.2pre1-patched/configure.ac
--- libquicktime-0.9.2pre1/configure.ac	Wed Aug 14 22:48:58 2002
+++ libquicktime-0.9.2pre1-patched/configure.ac	Fri Sep 20 11:42:17 2002
@@ -51,10 +51,12 @@
 
 dnl Build CFLAGS
 
-COMMON_CFLAGS=" -finline-functions -W -Wall -Wno-unused -Winline"
+COMMON_CFLAGS=" -finline-functions -W -Wall -Wno-unused -Winline $CFLAGS"
 PROFILE_CFLAGS=" -pg -fprofile-arcs -ftest-coverage"
 DEBUG_CFLAGS=" -g3"
-OPTIMIZE_CFLAGS=" -O3 -funroll-all-loops -fomit-frame-pointer -malign-loops=2 -malign-jumps=2 -malign-functions=2"
+#OPTIMIZE_CFLAGS=" -O3 -funroll-all-loops -fomit-frame-pointer -malign-loops=2 -malign-jumps=2 -malign-functions=2"
+OPTIMIZE_CFLAGS=" -O3 -funroll-all-loops -fomit-frame-pointer "
+
 
 # large file support
 COMMON_FLAGS="$COMMON_FLAGS -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
diff -ru libquicktime-0.9.2pre1/ltmain.sh libquicktime-0.9.2pre1-patched/ltmain.sh
--- libquicktime-0.9.2pre1/ltmain.sh	Mon Oct  1 22:31:21 2001
+++ libquicktime-0.9.2pre1-patched/ltmain.sh	Fri Sep 20 11:42:17 2002
@@ -1884,7 +1884,11 @@
 	      add="-l$name"
 	    else
 	      # We cannot seem to hardcode it, guess we'll fake it.
-	      add_dir="-L$libdir"
+             if test "X$installed" = Xyes; then
+               add_dir="-L$libdir"
+             else
+               add_dir="-L$DESTDIR$libdir"
+             fi
 	      add="-l$name"
 	    fi
 
@@ -2894,7 +2898,18 @@
 	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
 	  eval cmds=\"$archive_expsym_cmds\"
 	else
+          save_deplibs="$deplibs"
+          for conv in $convenience; do
+        tmp_deplibs=
+        for test_deplib in $deplibs; do
+          if test "$test_deplib" != "$conv"; then
+            tmp_deplibs="$tmp_deplibs $test_deplib"
+          fi
+        done
+        deplibs="$tmp_deplibs"
+          done
 	  eval cmds=\"$archive_cmds\"
+          deplibs="$save_deplibs"
 	fi
 	save_ifs="$IFS"; IFS='~'
 	for cmd in $cmds; do
@@ -3948,10 +3963,10 @@
 
 # Directory that this library needs to be installed in:
 libdir='$install_libdir'"
-	  if test "$installed" = no && test $need_relink = yes; then
-	    $echo >> $output "\
-relink_command=\"$relink_command\""
-	  fi
+#        if test "$installed" = no && test $need_relink = yes; then
+#          $echo >> $output "\
+#relink_command=\"$relink_command\""
+#        fi
 	done
       fi
 
@@ -4141,12 +4156,21 @@
 	esac
 
 	# Add the libdir to current_libdirs if it is the destination.
+       DESTDIR=
 	if test "X$destdir" = "X$libdir"; then
 	  case "$current_libdirs " in
 	  *" $libdir "*) ;;
 	  *) current_libdirs="$current_libdirs $libdir" ;;
 	  esac
 	else
+         case "$destdir" in
+           *"$libdir")
+             DESTDIR=`$echo "$destdir" | sed -e 's!'"$libdir"'$!!'`
+             if test "X$destdir" != "X$DESTDIR$libdir"; then
+               DESTDIR=
+             fi
+             ;;
+         esac
 	  # Note the libdir as a future libdir.
 	  case "$future_libdirs " in
 	  *" $libdir "*) ;;
@@ -4160,6 +4184,7 @@
 
 	if test -n "$relink_command"; then
 	  $echo "$modename: warning: relinking \`$file'" 1>&2
+         export DESTDIR
 	  $show "$relink_command"
 	  if $run eval "$relink_command"; then :
 	  else
@@ -4167,6 +4192,7 @@
 	    continue
 	  fi
 	fi
+       unset DESTDIR
 
 	# See the names of the shared library.
 	set dummy $library_names
diff -ru libquicktime-0.9.2pre1/plugins/audiocodec/Makefile.am libquicktime-0.9.2pre1-patched/plugins/audiocodec/Makefile.am
--- libquicktime-0.9.2pre1/plugins/audiocodec/Makefile.am	Mon Apr 15 07:03:13 2002
+++ libquicktime-0.9.2pre1-patched/plugins/audiocodec/Makefile.am	Fri Sep 20 11:42:27 2002
@@ -21,4 +21,4 @@
 twos.h \
 ulaw.h
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include/
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include/ -I$(includedir)
diff -ru libquicktime-0.9.2pre1/plugins/audiocodec/Makefile.in libquicktime-0.9.2pre1-patched/plugins/audiocodec/Makefile.in
--- libquicktime-0.9.2pre1/plugins/audiocodec/Makefile.in	Wed Aug 14 22:49:07 2002
+++ libquicktime-0.9.2pre1-patched/plugins/audiocodec/Makefile.in	Fri Sep 20 11:42:27 2002
@@ -144,7 +144,7 @@
 ulaw.h
 
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include/
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include/ -I$(includedir)
 subdir = plugins/audiocodec
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h \
diff -ru libquicktime-0.9.2pre1/plugins/audiocodec/ima4.h libquicktime-0.9.2pre1-patched/plugins/audiocodec/ima4.h
--- libquicktime-0.9.2pre1/plugins/audiocodec/ima4.h	Sun Feb 24 12:24:31 2002
+++ libquicktime-0.9.2pre1-patched/plugins/audiocodec/ima4.h	Fri Sep 20 11:42:13 2002
@@ -1,7 +1,7 @@
 #ifndef QUICKTIME_IMA4_H
 #define QUICKTIME_IMA4_H
 
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 
 typedef struct
 {
diff -ru libquicktime-0.9.2pre1/plugins/audiocodec/rawaudio.h libquicktime-0.9.2pre1-patched/plugins/audiocodec/rawaudio.h
--- libquicktime-0.9.2pre1/plugins/audiocodec/rawaudio.h	Sun Feb 24 12:24:31 2002
+++ libquicktime-0.9.2pre1-patched/plugins/audiocodec/rawaudio.h	Fri Sep 20 11:42:13 2002
@@ -1,7 +1,8 @@
 #ifndef QUICKTIME_RAWAUDIO_H
 #define QUICKTIME_RAWAUDIO_H
 
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
+#include <quicktime/qtprivate.h>
 
 typedef struct
 {
diff -ru libquicktime-0.9.2pre1/plugins/audiocodec/twos.c libquicktime-0.9.2pre1-patched/plugins/audiocodec/twos.c
--- libquicktime-0.9.2pre1/plugins/audiocodec/twos.c	Sun Feb 24 12:24:31 2002
+++ libquicktime-0.9.2pre1-patched/plugins/audiocodec/twos.c	Fri Sep 20 11:42:13 2002
@@ -1,5 +1,5 @@
 #include <funcprotos.h>
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 #include "twos.h"
 
 /* =================================== private for twos */
diff -ru libquicktime-0.9.2pre1/plugins/audiocodec/ulaw.h libquicktime-0.9.2pre1-patched/plugins/audiocodec/ulaw.h
--- libquicktime-0.9.2pre1/plugins/audiocodec/ulaw.h	Mon Apr  8 14:29:03 2002
+++ libquicktime-0.9.2pre1-patched/plugins/audiocodec/ulaw.h	Fri Sep 20 11:42:13 2002
@@ -1,7 +1,7 @@
 #ifndef QUICKTIME_ULAW_H
 #define QUICKTIME_ULAW_H
 
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 
 typedef struct
 {
diff -ru libquicktime-0.9.2pre1/plugins/dv/dv.c libquicktime-0.9.2pre1-patched/plugins/dv/dv.c
--- libquicktime-0.9.2pre1/plugins/dv/dv.c	Mon Apr 15 07:03:13 2002
+++ libquicktime-0.9.2pre1-patched/plugins/dv/dv.c	Fri Sep 20 11:42:11 2002
@@ -1,7 +1,7 @@
 #include <quicktime/colormodels.h>
 #include <funcprotos.h>
 #include <libdv/dv.h>
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 #include <pthread.h>
 #include <string.h>
 
diff -ru libquicktime-0.9.2pre1/plugins/ffmpeg/ffmpeg.h libquicktime-0.9.2pre1-patched/plugins/ffmpeg/ffmpeg.h
--- libquicktime-0.9.2pre1/plugins/ffmpeg/ffmpeg.h	Sun Aug 11 22:38:40 2002
+++ libquicktime-0.9.2pre1-patched/plugins/ffmpeg/ffmpeg.h	Fri Sep 20 11:42:12 2002
@@ -23,7 +23,7 @@
 #define QUICKTIME_FFMPEG_H
 
 #include "ffmpeg/avcodec.h"
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 
 typedef struct
   {
diff -ru libquicktime-0.9.2pre1/plugins/mjpeg/jpeg.c libquicktime-0.9.2pre1-patched/plugins/mjpeg/jpeg.c
--- libquicktime-0.9.2pre1/plugins/mjpeg/jpeg.c	Sat Mar  2 10:52:35 2002
+++ libquicktime-0.9.2pre1-patched/plugins/mjpeg/jpeg.c	Fri Sep 20 11:42:14 2002
@@ -4,7 +4,7 @@
 #include <funcprotos.h>
 #include <string.h>
 #include "jpeg.h"
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 
 static int delete_codec(quicktime_video_map_t *vtrack)
 {
diff -ru libquicktime-0.9.2pre1/plugins/opendivx/divx.c libquicktime-0.9.2pre1-patched/plugins/opendivx/divx.c
--- libquicktime-0.9.2pre1/plugins/opendivx/divx.c	Mon Apr 15 07:03:13 2002
+++ libquicktime-0.9.2pre1-patched/plugins/opendivx/divx.c	Fri Sep 20 11:42:14 2002
@@ -2,7 +2,7 @@
 
 #include <quicktime/colormodels.h>
 #include <funcprotos.h>
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 #include <workarounds.h>
 #include "encore50/encore.h"
 #include "decore50/decore.h"
diff -ru libquicktime-0.9.2pre1/plugins/png/qtpng.h libquicktime-0.9.2pre1-patched/plugins/png/qtpng.h
--- libquicktime-0.9.2pre1/plugins/png/qtpng.h	Sun Feb 24 12:24:31 2002
+++ libquicktime-0.9.2pre1-patched/plugins/png/qtpng.h	Fri Sep 20 11:42:14 2002
@@ -2,7 +2,7 @@
 #define QUICKTIME_PNG_H
 
 #include <png.h>
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 
 typedef struct
 {
diff -ru libquicktime-0.9.2pre1/plugins/rtjpeg/Makefile.am libquicktime-0.9.2pre1-patched/plugins/rtjpeg/Makefile.am
--- libquicktime-0.9.2pre1/plugins/rtjpeg/Makefile.am	Mon Jun  3 21:04:22 2002
+++ libquicktime-0.9.2pre1-patched/plugins/rtjpeg/Makefile.am	Fri Sep 20 11:42:14 2002
@@ -3,13 +3,13 @@
 
 pkglib_LTLIBRARIES = lqt_rtjpeg.la
 
-lqt_rtjpeg_la_SOURCES = rtjpeg.c lqt_rtjpeg.c RTjpeg.c
+lqt_rtjpeg_la_SOURCES = rtjpeg.c lqt_rtjpeg.c rtjpeg1.c
 lqt_rtjpeg_la_LDFLAGS = -avoid-version -module
 lqt_rtjpeg_la_LIBADD = @MODULE_LIBADD@
 
-noinst_HEADERS = RTjpeg.h rtjpeg.h mmx.h
+noinst_HEADERS = rtjpeg1.h rtjpeg.h mmx.h
 
 INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include/
 
-RTjpeg.lo:	RTjpeg.c RTjpeg.h
-	gcc @RTJPEG_CFLAGS@ -c RTjpeg.c -o RTjpeg.lo
+RTjpeg.lo:	rtjpeg1.c rtjpeg1.h
+	gcc @RTJPEG_CFLAGS@ -c rtjpeg1.c -o RTjpeg.lo
diff -ru libquicktime-0.9.2pre1/plugins/rtjpeg/Makefile.in libquicktime-0.9.2pre1-patched/plugins/rtjpeg/Makefile.in
--- libquicktime-0.9.2pre1/plugins/rtjpeg/Makefile.in	Wed Aug 14 22:49:08 2002
+++ libquicktime-0.9.2pre1-patched/plugins/rtjpeg/Makefile.in	Fri Sep 20 11:42:14 2002
@@ -125,11 +125,11 @@
 
 pkglib_LTLIBRARIES = lqt_rtjpeg.la
 
-lqt_rtjpeg_la_SOURCES = rtjpeg.c lqt_rtjpeg.c RTjpeg.c
+lqt_rtjpeg_la_SOURCES = rtjpeg.c lqt_rtjpeg.c rtjpeg1.c
 lqt_rtjpeg_la_LDFLAGS = -avoid-version -module
 lqt_rtjpeg_la_LIBADD = @MODULE_LIBADD@
 
-noinst_HEADERS = RTjpeg.h rtjpeg.h mmx.h
+noinst_HEADERS = rtjpeg1.h rtjpeg.h mmx.h
 
 INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include/
 subdir = plugins/rtjpeg
@@ -140,7 +140,7 @@
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 
 lqt_rtjpeg_la_DEPENDENCIES =
-am_lqt_rtjpeg_la_OBJECTS = rtjpeg.lo lqt_rtjpeg.lo RTjpeg.lo
+am_lqt_rtjpeg_la_OBJECTS = rtjpeg.lo lqt_rtjpeg.lo rtjpeg1.lo
 lqt_rtjpeg_la_OBJECTS = $(am_lqt_rtjpeg_la_OBJECTS)
 
 DEFS = @DEFS@
@@ -149,8 +149,8 @@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/RTjpeg.Plo $(DEPDIR)/lqt_rtjpeg.Plo \
-@AMDEP_TRUE@	$(DEPDIR)/rtjpeg.Plo
+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/lqt_rtjpeg.Plo $(DEPDIR)/rtjpeg.Plo \
+@AMDEP_TRUE@	$(DEPDIR)/rtjpeg1.Plo
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
@@ -212,9 +212,9 @@
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/RTjpeg.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/lqt_rtjpeg.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/rtjpeg.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/rtjpeg1.Plo@am__quote@
 
 distclean-depend:
 	-rm -rf $(DEPDIR)
@@ -374,8 +374,8 @@
 	uninstall-am uninstall-info-am uninstall-pkglibLTLIBRARIES
 
 
-RTjpeg.lo:	RTjpeg.c RTjpeg.h
-	gcc @RTJPEG_CFLAGS@ -c RTjpeg.c -o RTjpeg.lo
+RTjpeg.lo:	rtjpeg1.c rtjpeg1.h
+	gcc @RTJPEG_CFLAGS@ -c rtjpeg1.c -o RTjpeg.lo
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -ru libquicktime-0.9.2pre1/plugins/rtjpeg/rtjpeg.h libquicktime-0.9.2pre1-patched/plugins/rtjpeg/rtjpeg.h
--- libquicktime-0.9.2pre1/plugins/rtjpeg/rtjpeg.h	Mon Jun  3 21:04:22 2002
+++ libquicktime-0.9.2pre1-patched/plugins/rtjpeg/rtjpeg.h	Fri Sep 20 11:42:14 2002
@@ -22,8 +22,8 @@
 #ifndef QUICKTIME_RTJPEG_H
 #define QUICKTIME_RTJPEG_H
 
-#include "RTjpeg.h"
-#include <quicktime/quicktime.h>
+#include "rtjpeg1.h"
+#include "quicktime/quicktime.h"
 
 typedef struct
 {
diff -ru libquicktime-0.9.2pre1/plugins/rtjpeg/rtjpeg1.c libquicktime-0.9.2pre1-patched/plugins/rtjpeg/rtjpeg1.c
--- libquicktime-0.9.2pre1/plugins/rtjpeg/rtjpeg1.c	Mon Jun  3 21:04:22 2002
+++ libquicktime-0.9.2pre1-patched/plugins/rtjpeg/rtjpeg1.c	Fri Sep 20 11:42:14 2002
@@ -35,7 +35,7 @@
 #include <stdlib.h>
 #include <string.h>
 #define __RTJPEG_INTERNAL__
-#include "RTjpeg.h"
+#include "rtjpeg1.h"
 
 #ifdef MMX
 #include "mmx.h"
diff -ru libquicktime-0.9.2pre1/plugins/videocodec/raw.c libquicktime-0.9.2pre1-patched/plugins/videocodec/raw.c
--- libquicktime-0.9.2pre1/plugins/videocodec/raw.c	Sat Apr 27 02:50:36 2002
+++ libquicktime-0.9.2pre1-patched/plugins/videocodec/raw.c	Fri Sep 20 11:42:12 2002
@@ -1,6 +1,6 @@
 #include <quicktime/colormodels.h>
 #include <funcprotos.h>
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 #include <funcprotos.h>
 #include <graphics.h>
 
diff -ru libquicktime-0.9.2pre1/plugins/videocodec/v308.c libquicktime-0.9.2pre1-patched/plugins/videocodec/v308.c
--- libquicktime-0.9.2pre1/plugins/videocodec/v308.c	Mon Apr  8 14:29:04 2002
+++ libquicktime-0.9.2pre1-patched/plugins/videocodec/v308.c	Fri Sep 20 11:42:12 2002
@@ -1,6 +1,6 @@
 #include <quicktime/colormodels.h>
 #include <funcprotos.h>
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 #include <workarounds.h>
 #include "v308.h"
 
diff -ru libquicktime-0.9.2pre1/plugins/videocodec/v408.c libquicktime-0.9.2pre1-patched/plugins/videocodec/v408.c
--- libquicktime-0.9.2pre1/plugins/videocodec/v408.c	Mon Apr  8 14:29:04 2002
+++ libquicktime-0.9.2pre1-patched/plugins/videocodec/v408.c	Fri Sep 20 11:42:12 2002
@@ -1,6 +1,6 @@
 #include <quicktime/colormodels.h>
 #include <funcprotos.h>
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 #include <workarounds.h>
 #include "v408.h"
 
diff -ru libquicktime-0.9.2pre1/plugins/videocodec/v410.c libquicktime-0.9.2pre1-patched/plugins/videocodec/v410.c
--- libquicktime-0.9.2pre1/plugins/videocodec/v410.c	Mon Apr  8 14:29:04 2002
+++ libquicktime-0.9.2pre1-patched/plugins/videocodec/v410.c	Fri Sep 20 11:42:12 2002
@@ -1,6 +1,6 @@
 #include <quicktime/colormodels.h>
 #include <funcprotos.h>
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 #include <workarounds.h>
 #include "v410.h"
 
diff -ru libquicktime-0.9.2pre1/plugins/videocodec/yuv2.h libquicktime-0.9.2pre1-patched/plugins/videocodec/yuv2.h
--- libquicktime-0.9.2pre1/plugins/videocodec/yuv2.h	Sun Feb 24 12:24:31 2002
+++ libquicktime-0.9.2pre1-patched/plugins/videocodec/yuv2.h	Fri Sep 20 11:42:12 2002
@@ -1,7 +1,7 @@
 #ifndef QUICKTIME_YUV2_H
 #define QUICKTIME_YUV2_H
 
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 
 typedef struct
 {
diff -ru libquicktime-0.9.2pre1/plugins/videocodec/yuv4.h libquicktime-0.9.2pre1-patched/plugins/videocodec/yuv4.h
--- libquicktime-0.9.2pre1/plugins/videocodec/yuv4.h	Sun Feb 24 12:24:31 2002
+++ libquicktime-0.9.2pre1-patched/plugins/videocodec/yuv4.h	Fri Sep 20 11:42:13 2002
@@ -1,7 +1,7 @@
 #ifndef QUICKTIME_YUV4_H
 #define QUICKTIME_YUV4_H
 
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 
 typedef struct
 {
diff -ru libquicktime-0.9.2pre1/plugins/videocodec/yv12.h libquicktime-0.9.2pre1-patched/plugins/videocodec/yv12.h
--- libquicktime-0.9.2pre1/plugins/videocodec/yv12.h	Sun Feb 24 12:24:31 2002
+++ libquicktime-0.9.2pre1-patched/plugins/videocodec/yv12.h	Fri Sep 20 11:42:13 2002
@@ -2,7 +2,7 @@
 #define QUICKTIME_YUV2_H
 
 #include <quicktime/colormodels.h>
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 
 typedef struct
 {
diff -ru libquicktime-0.9.2pre1/plugins/vorbis/vorbis.c libquicktime-0.9.2pre1-patched/plugins/vorbis/vorbis.c
--- libquicktime-0.9.2pre1/plugins/vorbis/vorbis.c	Sat Mar  2 10:52:35 2002
+++ libquicktime-0.9.2pre1-patched/plugins/vorbis/vorbis.c	Fri Sep 20 11:42:11 2002
@@ -1,5 +1,5 @@
 #include <funcprotos.h>
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 #include <time.h>
 #include <string.h>
 #include "qtvorbis.h"
diff -ru libquicktime-0.9.2pre1/src/atom.c libquicktime-0.9.2pre1-patched/src/atom.c
--- libquicktime-0.9.2pre1/src/atom.c	Sat Mar  2 10:52:35 2002
+++ libquicktime-0.9.2pre1-patched/src/atom.c	Fri Sep 20 11:42:11 2002
@@ -1,7 +1,7 @@
 #include <ctype.h>
 #include <stdio.h>
 #include <funcprotos.h>
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 
 
 
diff -ru libquicktime-0.9.2pre1/src/ctab.c libquicktime-0.9.2pre1-patched/src/ctab.c
--- libquicktime-0.9.2pre1/src/ctab.c	Mon Jun 24 19:49:42 2002
+++ libquicktime-0.9.2pre1-patched/src/ctab.c	Fri Sep 20 11:42:11 2002
@@ -1,6 +1,6 @@
 #include <stdio.h>
 #include <funcprotos.h>
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 
 int quicktime_ctab_init(quicktime_ctab_t *ctab)
 {
diff -ru libquicktime-0.9.2pre1/src/dinf.c libquicktime-0.9.2pre1-patched/src/dinf.c
--- libquicktime-0.9.2pre1/src/dinf.c	Sun Mar  3 09:14:48 2002
+++ libquicktime-0.9.2pre1-patched/src/dinf.c	Fri Sep 20 11:42:11 2002
@@ -1,5 +1,5 @@
 #include <funcprotos.h>
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 #include <dinf.h>
 
 void quicktime_dinf_init(quicktime_dinf_t *dinf)
diff -ru libquicktime-0.9.2pre1/src/dref.c libquicktime-0.9.2pre1-patched/src/dref.c
--- libquicktime-0.9.2pre1/src/dref.c	Sat Mar  2 10:52:35 2002
+++ libquicktime-0.9.2pre1-patched/src/dref.c	Fri Sep 20 11:42:11 2002
@@ -1,5 +1,5 @@
 #include <funcprotos.h>
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 #include <string.h>
 
 void quicktime_dref_table_init(quicktime_dref_table_t *table)
diff -ru libquicktime-0.9.2pre1/src/edts.c libquicktime-0.9.2pre1-patched/src/edts.c
--- libquicktime-0.9.2pre1/src/edts.c	Sun Mar  3 09:14:48 2002
+++ libquicktime-0.9.2pre1-patched/src/edts.c	Fri Sep 20 11:42:11 2002
@@ -1,5 +1,5 @@
 #include <funcprotos.h>
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 #include <elst.h>
 
 void quicktime_edts_init(quicktime_edts_t *edts)
diff -ru libquicktime-0.9.2pre1/src/elst.c libquicktime-0.9.2pre1-patched/src/elst.c
--- libquicktime-0.9.2pre1/src/elst.c	Sat Mar  2 10:52:35 2002
+++ libquicktime-0.9.2pre1-patched/src/elst.c	Fri Sep 20 11:42:11 2002
@@ -1,5 +1,5 @@
 #include <funcprotos.h>
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 
 
 void quicktime_elst_table_init(quicktime_elst_table_t *table)
diff -ru libquicktime-0.9.2pre1/src/hdlr.c libquicktime-0.9.2pre1-patched/src/hdlr.c
--- libquicktime-0.9.2pre1/src/hdlr.c	Sat Mar  2 10:52:35 2002
+++ libquicktime-0.9.2pre1-patched/src/hdlr.c	Fri Sep 20 11:42:11 2002
@@ -1,5 +1,5 @@
 #include <funcprotos.h>
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 #include <string.h>
 
 
diff -ru libquicktime-0.9.2pre1/src/lqt_codecinfo.c libquicktime-0.9.2pre1-patched/src/lqt_codecinfo.c
--- libquicktime-0.9.2pre1/src/lqt_codecinfo.c	Sun Jun 30 18:47:44 2002
+++ libquicktime-0.9.2pre1-patched/src/lqt_codecinfo.c	Tue Sep 24 09:02:04 2002
@@ -410,7 +410,7 @@
 
   if(!get_codec_api_version)
     {
-    fprintf(stderr, "module %s has to API version and is thus terribly old\n",
+    fprintf(stderr, "module %s has no API version and is thus terribly old\n",
             plugin_filename);
     return ret;
     }
diff -ru libquicktime-0.9.2pre1/src/lqt_loader.c libquicktime-0.9.2pre1-patched/src/lqt_loader.c
--- libquicktime-0.9.2pre1/src/lqt_loader.c	Sun Feb 24 12:24:31 2002
+++ libquicktime-0.9.2pre1-patched/src/lqt_loader.c	Fri Sep 20 11:42:11 2002
@@ -1,3 +1,3 @@
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 #include <quicktime/lqt.h>
 #include <quicktime/lqt_codecinfo.h>
diff -ru libquicktime-0.9.2pre1/src/lqt_plugin.c libquicktime-0.9.2pre1-patched/src/lqt_plugin.c
--- libquicktime-0.9.2pre1/src/lqt_plugin.c	Mon Apr  8 14:32:56 2002
+++ libquicktime-0.9.2pre1-patched/src/lqt_plugin.c	Fri Sep 20 11:42:11 2002
@@ -2,7 +2,7 @@
 #include <dirent.h>
 #include <dlfcn.h>
 #include <string.h>
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 #include <quicktime/lqt.h>
 #include <funcprotos.h>
 #include "config.h"
diff -ru libquicktime-0.9.2pre1/src/lqt_quicktime.c libquicktime-0.9.2pre1-patched/src/lqt_quicktime.c
--- libquicktime-0.9.2pre1/src/lqt_quicktime.c	Mon Apr 15 18:44:44 2002
+++ libquicktime-0.9.2pre1-patched/src/lqt_quicktime.c	Fri Sep 20 11:42:11 2002
@@ -1,5 +1,5 @@
 #include <quicktime/colormodels.h>
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 #include <quicktime/lqt.h>
 #include <lqt_private.h>
 #include <funcprotos.h>
diff -ru libquicktime-0.9.2pre1/src/matrix.c libquicktime-0.9.2pre1-patched/src/matrix.c
--- libquicktime-0.9.2pre1/src/matrix.c	Sun Feb 24 12:24:31 2002
+++ libquicktime-0.9.2pre1-patched/src/matrix.c	Fri Sep 20 11:42:11 2002
@@ -1,5 +1,5 @@
 #include <funcprotos.h>
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 
 
 
diff -ru libquicktime-0.9.2pre1/src/mdat.c libquicktime-0.9.2pre1-patched/src/mdat.c
--- libquicktime-0.9.2pre1/src/mdat.c	Sun Feb 24 12:24:31 2002
+++ libquicktime-0.9.2pre1-patched/src/mdat.c	Fri Sep 20 11:42:11 2002
@@ -1,6 +1,6 @@
 #include <stdio.h>
 #include <funcprotos.h>
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 
 void quicktime_mdat_delete(quicktime_mdat_t *mdat)
 {
diff -ru libquicktime-0.9.2pre1/src/mdhd.c libquicktime-0.9.2pre1-patched/src/mdhd.c
--- libquicktime-0.9.2pre1/src/mdhd.c	Sat Mar  2 10:52:35 2002
+++ libquicktime-0.9.2pre1-patched/src/mdhd.c	Fri Sep 20 11:42:11 2002
@@ -1,5 +1,5 @@
 #include <funcprotos.h>
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 
 void quicktime_mdhd_init(quicktime_mdhd_t *mdhd)
 {
diff -ru libquicktime-0.9.2pre1/src/mdia.c libquicktime-0.9.2pre1-patched/src/mdia.c
--- libquicktime-0.9.2pre1/src/mdia.c	Sun Mar  3 09:14:48 2002
+++ libquicktime-0.9.2pre1-patched/src/mdia.c	Fri Sep 20 11:42:11 2002
@@ -1,5 +1,5 @@
 #include <funcprotos.h>
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 #include <mdhd.h>
 #include <hdlr.h>
 #include <mdia.h>
diff -ru libquicktime-0.9.2pre1/src/minf.c libquicktime-0.9.2pre1-patched/src/minf.c
--- libquicktime-0.9.2pre1/src/minf.c	Sun Mar  3 09:14:48 2002
+++ libquicktime-0.9.2pre1-patched/src/minf.c	Fri Sep 20 11:42:11 2002
@@ -1,5 +1,5 @@
 #include <funcprotos.h>
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 #include <vmhd.h>
 #include <smhd.h>
 #include <hdlr.h>
diff -ru libquicktime-0.9.2pre1/src/moov.c libquicktime-0.9.2pre1-patched/src/moov.c
--- libquicktime-0.9.2pre1/src/moov.c	Sun Mar  3 09:14:48 2002
+++ libquicktime-0.9.2pre1-patched/src/moov.c	Fri Sep 20 11:42:11 2002
@@ -1,5 +1,5 @@
 #include <funcprotos.h>
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 #include <udta.h>
 #include <ctab.h>
 #include <mvhd.h>
diff -ru libquicktime-0.9.2pre1/src/mvhd.c libquicktime-0.9.2pre1-patched/src/mvhd.c
--- libquicktime-0.9.2pre1/src/mvhd.c	Sun Mar  3 09:14:48 2002
+++ libquicktime-0.9.2pre1-patched/src/mvhd.c	Fri Sep 20 11:42:11 2002
@@ -1,5 +1,5 @@
 #include <funcprotos.h>
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 #include <matrix.h>
 
 int quicktime_mvhd_init(quicktime_mvhd_t *mvhd)
diff -ru libquicktime-0.9.2pre1/src/smhd.c libquicktime-0.9.2pre1-patched/src/smhd.c
--- libquicktime-0.9.2pre1/src/smhd.c	Sat Mar  2 10:52:35 2002
+++ libquicktime-0.9.2pre1-patched/src/smhd.c	Fri Sep 20 11:42:11 2002
@@ -1,5 +1,5 @@
 #include <funcprotos.h>
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 
 
 
diff -ru libquicktime-0.9.2pre1/src/stbl.c libquicktime-0.9.2pre1-patched/src/stbl.c
--- libquicktime-0.9.2pre1/src/stbl.c	Sun Mar  3 09:14:48 2002
+++ libquicktime-0.9.2pre1-patched/src/stbl.c	Fri Sep 20 11:42:11 2002
@@ -1,5 +1,5 @@
 #include <funcprotos.h>
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 #include <stsd.h>
 #include <stss.h>
 #include <stsz.h>
diff -ru libquicktime-0.9.2pre1/src/stco.c libquicktime-0.9.2pre1-patched/src/stco.c
--- libquicktime-0.9.2pre1/src/stco.c	Sat Mar  2 10:52:35 2002
+++ libquicktime-0.9.2pre1-patched/src/stco.c	Fri Sep 20 11:42:11 2002
@@ -1,5 +1,5 @@
 #include <funcprotos.h>
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 
 
 
diff -ru libquicktime-0.9.2pre1/src/stsc.c libquicktime-0.9.2pre1-patched/src/stsc.c
--- libquicktime-0.9.2pre1/src/stsc.c	Sat Mar  2 10:52:35 2002
+++ libquicktime-0.9.2pre1-patched/src/stsc.c	Fri Sep 20 11:42:11 2002
@@ -1,5 +1,5 @@
 #include <funcprotos.h>
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 
 
 
diff -ru libquicktime-0.9.2pre1/src/stsd.c libquicktime-0.9.2pre1-patched/src/stsd.c
--- libquicktime-0.9.2pre1/src/stsd.c	Sun Mar  3 09:14:48 2002
+++ libquicktime-0.9.2pre1-patched/src/stsd.c	Fri Sep 20 11:42:11 2002
@@ -1,5 +1,5 @@
 #include <funcprotos.h>
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 #include <stsdtable.h>
 
 void quicktime_stsd_init(quicktime_stsd_t *stsd)
diff -ru libquicktime-0.9.2pre1/src/stsdtable.c libquicktime-0.9.2pre1-patched/src/stsdtable.c
--- libquicktime-0.9.2pre1/src/stsdtable.c	Mon Jun 24 19:37:49 2002
+++ libquicktime-0.9.2pre1-patched/src/stsdtable.c	Fri Sep 20 11:42:11 2002
@@ -1,5 +1,5 @@
 #include <funcprotos.h>
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 #include <string.h>
 #include <stsd.h>
 #include <ctab.h>
diff -ru libquicktime-0.9.2pre1/src/stss.c libquicktime-0.9.2pre1-patched/src/stss.c
--- libquicktime-0.9.2pre1/src/stss.c	Sat Mar  2 10:52:35 2002
+++ libquicktime-0.9.2pre1-patched/src/stss.c	Fri Sep 20 11:42:11 2002
@@ -1,5 +1,5 @@
 #include <funcprotos.h>
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 
 
 
diff -ru libquicktime-0.9.2pre1/src/stsz.c libquicktime-0.9.2pre1-patched/src/stsz.c
--- libquicktime-0.9.2pre1/src/stsz.c	Mon Apr  8 14:32:56 2002
+++ libquicktime-0.9.2pre1-patched/src/stsz.c	Fri Sep 20 11:42:11 2002
@@ -1,5 +1,5 @@
 #include <funcprotos.h>
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 
 
 
diff -ru libquicktime-0.9.2pre1/src/stts.c libquicktime-0.9.2pre1-patched/src/stts.c
--- libquicktime-0.9.2pre1/src/stts.c	Sat Mar  2 10:52:35 2002
+++ libquicktime-0.9.2pre1-patched/src/stts.c	Fri Sep 20 11:42:11 2002
@@ -1,5 +1,5 @@
 #include <funcprotos.h>
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 
 
 
diff -ru libquicktime-0.9.2pre1/src/tkhd.c libquicktime-0.9.2pre1-patched/src/tkhd.c
--- libquicktime-0.9.2pre1/src/tkhd.c	Sun Mar  3 09:14:48 2002
+++ libquicktime-0.9.2pre1-patched/src/tkhd.c	Fri Sep 20 11:42:11 2002
@@ -1,5 +1,5 @@
 #include <funcprotos.h>
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 #include <matrix.h>
 
 int quicktime_tkhd_init(quicktime_tkhd_t *tkhd)
diff -ru libquicktime-0.9.2pre1/src/trak.c libquicktime-0.9.2pre1-patched/src/trak.c
--- libquicktime-0.9.2pre1/src/trak.c	Sun Mar  3 09:14:48 2002
+++ libquicktime-0.9.2pre1-patched/src/trak.c	Fri Sep 20 11:42:11 2002
@@ -1,5 +1,5 @@
 #include <funcprotos.h>
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 #include <tkhd.h>
 #include <edts.h>
 #include <mdia.h>
diff -ru libquicktime-0.9.2pre1/src/udta.c libquicktime-0.9.2pre1-patched/src/udta.c
--- libquicktime-0.9.2pre1/src/udta.c	Tue Mar 26 20:20:40 2002
+++ libquicktime-0.9.2pre1-patched/src/udta.c	Fri Sep 20 11:42:11 2002
@@ -1,5 +1,5 @@
 #include <funcprotos.h>
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 #include <string.h>
 
 #define DEFAULT_INFO "Made with Quicktime for Linux"
diff -ru libquicktime-0.9.2pre1/src/util.c libquicktime-0.9.2pre1-patched/src/util.c
--- libquicktime-0.9.2pre1/src/util.c	Mon Apr  8 14:32:56 2002
+++ libquicktime-0.9.2pre1-patched/src/util.c	Fri Sep 20 11:42:11 2002
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <funcprotos.h>
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 #include <workarounds.h>
 #include <string.h>
 #include <hdlr.h>
diff -ru libquicktime-0.9.2pre1/src/vmhd.c libquicktime-0.9.2pre1-patched/src/vmhd.c
--- libquicktime-0.9.2pre1/src/vmhd.c	Sat Mar  2 10:52:35 2002
+++ libquicktime-0.9.2pre1-patched/src/vmhd.c	Fri Sep 20 11:42:11 2002
@@ -1,5 +1,5 @@
 #include <funcprotos.h>
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 
 
 void quicktime_vmhd_init(quicktime_vmhd_t *vmhd)
diff -ru libquicktime-0.9.2pre1/utils/Makefile.am libquicktime-0.9.2pre1-patched/utils/Makefile.am
--- libquicktime-0.9.2pre1/utils/Makefile.am	Tue May 21 04:21:06 2002
+++ libquicktime-0.9.2pre1-patched/utils/Makefile.am	Fri Sep 20 11:42:15 2002
@@ -14,8 +14,8 @@
 xman :=
 endif
 noinst_PROGRAMS := test_codec testqt
-bin_PROGRAMS := $(xbin) qtinfo qtstreamize qtdechunk qtrechunk qtyuv4toyuv qtdump qtrecover
-man1_MANS := $(xman)
+bin_PROGRAMS := qtinfo qtstreamize qtdechunk qtrechunk qtyuv4toyuv qtdump qtrecover
+man1_MANS := 
 
 testqt_SOURCES=testqt.c
 testqt_LDADD=@UTIL_LIBADD@ -lm
@@ -44,9 +44,9 @@
 qtyuv4toyuv_SOURCES=yuv4toyuv.c
 qtyuv4toyuv_LDADD=@UTIL_LIBADD@
 
-lqtplay_SOURCES=lqtplay.c
-lqtplay_LDADD=@UTIL_LIBADD@ @X_LIBS@ -lXaw -lXt @X_PRE_LIBS@ -lXext \
-	-lXv -lGLU -lGL -lX11 @X_EXTRA_LIBS@ -lm
+#lqtplay_SOURCES=lqtplay.c
+#lqtplay_LDADD=@UTIL_LIBADD@ @X_LIBS@ -lXaw -lXt @X_PRE_LIBS@ -lXext \
+#	-lXv -lGLU -lGL -lX11 @X_EXTRA_LIBS@ -lm
 
 INCLUDES = -I$(top_srcdir)/include @X_CFLAGS@
 
diff -ru libquicktime-0.9.2pre1/utils/Makefile.in libquicktime-0.9.2pre1-patched/utils/Makefile.in
--- libquicktime-0.9.2pre1/utils/Makefile.in	Wed Aug 14 22:49:11 2002
+++ libquicktime-0.9.2pre1-patched/utils/Makefile.in	Fri Sep 20 11:42:27 2002
@@ -131,8 +131,8 @@
 @HAVE_X11_TRUE@xman := lqtplay.1
 @HAVE_X11_FALSE@xman := 
 noinst_PROGRAMS := test_codec testqt
-bin_PROGRAMS := $(xbin) qtinfo qtstreamize qtdechunk qtrechunk qtyuv4toyuv qtdump qtrecover
-man1_MANS := $(xman)
+bin_PROGRAMS := qtinfo qtstreamize qtdechunk qtrechunk qtyuv4toyuv qtdump qtrecover
+man1_MANS := 
 
 testqt_SOURCES = testqt.c
 testqt_LDADD = @UTIL_LIBADD@ -lm
@@ -161,11 +161,10 @@
 qtyuv4toyuv_SOURCES = yuv4toyuv.c
 qtyuv4toyuv_LDADD = @UTIL_LIBADD@
 
-lqtplay_SOURCES = lqtplay.c
-lqtplay_LDADD = @UTIL_LIBADD@ @X_LIBS@ -lXaw -lXt @X_PRE_LIBS@ -lXext \
-	-lXv -lGLU -lGL -lX11 @X_EXTRA_LIBS@ -lm
-
 
+#lqtplay_SOURCES=lqtplay.c
+#lqtplay_LDADD=@UTIL_LIBADD@ @X_LIBS@ -lXaw -lXt @X_PRE_LIBS@ -lXext \
+#	-lXv -lGLU -lGL -lX11 @X_EXTRA_LIBS@ -lm
 INCLUDES = -I$(top_srcdir)/include @X_CFLAGS@
 
 EXTRA_DIST = lqtplay.1
@@ -174,21 +173,12 @@
 CONFIG_HEADER = $(top_builddir)/config.h \
 	$(top_builddir)/include/quicktime/lqt1394_config.h
 CONFIG_CLEAN_FILES =
-@HAVE_X11_TRUE@bin_PROGRAMS = lqtplay$(EXEEXT) qtinfo$(EXEEXT) \
-@HAVE_X11_TRUE@	qtstreamize$(EXEEXT) qtdechunk$(EXEEXT) \
-@HAVE_X11_TRUE@	qtrechunk$(EXEEXT) qtyuv4toyuv$(EXEEXT) \
-@HAVE_X11_TRUE@	qtdump$(EXEEXT) qtrecover$(EXEEXT)
-@HAVE_X11_FALSE@bin_PROGRAMS = qtinfo$(EXEEXT) qtstreamize$(EXEEXT) \
-@HAVE_X11_FALSE@	qtdechunk$(EXEEXT) qtrechunk$(EXEEXT) \
-@HAVE_X11_FALSE@	qtyuv4toyuv$(EXEEXT) qtdump$(EXEEXT) \
-@HAVE_X11_FALSE@	qtrecover$(EXEEXT)
+bin_PROGRAMS = qtinfo$(EXEEXT) qtstreamize$(EXEEXT) qtdechunk$(EXEEXT) \
+	qtrechunk$(EXEEXT) qtyuv4toyuv$(EXEEXT) qtdump$(EXEEXT) \
+	qtrecover$(EXEEXT)
 noinst_PROGRAMS = test_codec$(EXEEXT) testqt$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
 
-am_lqtplay_OBJECTS = lqtplay.$(OBJEXT)
-lqtplay_OBJECTS = $(am_lqtplay_OBJECTS)
-lqtplay_DEPENDENCIES =
-lqtplay_LDFLAGS =
 am_qtdechunk_OBJECTS = dechunk.$(OBJEXT)
 qtdechunk_OBJECTS = $(am_qtdechunk_OBJECTS)
 qtdechunk_DEPENDENCIES =
@@ -233,10 +223,10 @@
 LIBS = @LIBS@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dechunk.Po $(DEPDIR)/dump.Po \
-@AMDEP_TRUE@	$(DEPDIR)/lqtplay.Po $(DEPDIR)/qtinfo.Po \
-@AMDEP_TRUE@	$(DEPDIR)/qtstreamize.Po $(DEPDIR)/rechunk.Po \
-@AMDEP_TRUE@	$(DEPDIR)/recover.Po $(DEPDIR)/test_codec.Po \
-@AMDEP_TRUE@	$(DEPDIR)/testqt.Po $(DEPDIR)/yuv4toyuv.Po
+@AMDEP_TRUE@	$(DEPDIR)/qtinfo.Po $(DEPDIR)/qtstreamize.Po \
+@AMDEP_TRUE@	$(DEPDIR)/rechunk.Po $(DEPDIR)/recover.Po \
+@AMDEP_TRUE@	$(DEPDIR)/test_codec.Po $(DEPDIR)/testqt.Po \
+@AMDEP_TRUE@	$(DEPDIR)/yuv4toyuv.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
@@ -245,8 +235,8 @@
 LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 CFLAGS = @CFLAGS@
-DIST_SOURCES = $(lqtplay_SOURCES) $(qtdechunk_SOURCES) $(qtdump_SOURCES) \
-	$(qtinfo_SOURCES) $(qtrechunk_SOURCES) $(qtrecover_SOURCES) \
+DIST_SOURCES = $(qtdechunk_SOURCES) $(qtdump_SOURCES) $(qtinfo_SOURCES) \
+	$(qtrechunk_SOURCES) $(qtrecover_SOURCES) \
 	$(qtstreamize_SOURCES) $(qtyuv4toyuv_SOURCES) \
 	$(test_codec_SOURCES) $(testqt_SOURCES)
 
@@ -259,7 +249,7 @@
 	uninstall-recursive check-recursive installcheck-recursive
 DIST_COMMON = Makefile.am Makefile.in
 DIST_SUBDIRS = gtk
-SOURCES = $(lqtplay_SOURCES) $(qtdechunk_SOURCES) $(qtdump_SOURCES) $(qtinfo_SOURCES) $(qtrechunk_SOURCES) $(qtrecover_SOURCES) $(qtstreamize_SOURCES) $(qtyuv4toyuv_SOURCES) $(test_codec_SOURCES) $(testqt_SOURCES)
+SOURCES = $(qtdechunk_SOURCES) $(qtdump_SOURCES) $(qtinfo_SOURCES) $(qtrechunk_SOURCES) $(qtrecover_SOURCES) $(qtstreamize_SOURCES) $(qtyuv4toyuv_SOURCES) $(test_codec_SOURCES) $(testqt_SOURCES)
 
 all: all-recursive
 
@@ -308,9 +298,6 @@
 
 clean-noinstPROGRAMS:
 	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
-lqtplay$(EXEEXT): $(lqtplay_OBJECTS) $(lqtplay_DEPENDENCIES) 
-	@rm -f lqtplay$(EXEEXT)
-	$(LINK) $(lqtplay_LDFLAGS) $(lqtplay_OBJECTS) $(lqtplay_LDADD) $(LIBS)
 qtdechunk$(EXEEXT): $(qtdechunk_OBJECTS) $(qtdechunk_DEPENDENCIES) 
 	@rm -f qtdechunk$(EXEEXT)
 	$(LINK) $(qtdechunk_LDFLAGS) $(qtdechunk_OBJECTS) $(qtdechunk_LDADD) $(LIBS)
@@ -347,7 +334,6 @@
 
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dechunk.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dump.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/lqtplay.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/qtinfo.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/qtstreamize.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/rechunk.Po@am__quote@
diff -ru libquicktime-0.9.2pre1/utils/dechunk.c libquicktime-0.9.2pre1-patched/utils/dechunk.c
--- libquicktime-0.9.2pre1/utils/dechunk.c	Sat Mar  2 10:52:35 2002
+++ libquicktime-0.9.2pre1-patched/utils/dechunk.c	Fri Sep 20 11:42:16 2002
@@ -1,5 +1,5 @@
 #include <funcprotos.h>
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 
 #include <string.h>
 
diff -ru libquicktime-0.9.2pre1/utils/dump.c libquicktime-0.9.2pre1-patched/utils/dump.c
--- libquicktime-0.9.2pre1/utils/dump.c	Sat Mar  2 10:52:35 2002
+++ libquicktime-0.9.2pre1-patched/utils/dump.c	Fri Sep 20 11:42:15 2002
@@ -1,4 +1,4 @@
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 
 
 
diff -ru libquicktime-0.9.2pre1/utils/qtinfo.c libquicktime-0.9.2pre1-patched/utils/qtinfo.c
--- libquicktime-0.9.2pre1/utils/qtinfo.c	Sun Feb 24 12:24:31 2002
+++ libquicktime-0.9.2pre1-patched/utils/qtinfo.c	Fri Sep 20 11:42:15 2002
@@ -1,6 +1,6 @@
 /* 	Qtinfo by Elliot Lee <sopwith@redhat.com> */
 
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 
 static void file_info(char *filename);
 
diff -ru libquicktime-0.9.2pre1/utils/qtstreamize.c libquicktime-0.9.2pre1-patched/utils/qtstreamize.c
--- libquicktime-0.9.2pre1/utils/qtstreamize.c	Sun Feb 24 12:24:31 2002
+++ libquicktime-0.9.2pre1-patched/utils/qtstreamize.c	Fri Sep 20 11:42:15 2002
@@ -1,4 +1,4 @@
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 
 int main(int argc, char *argv[])
 {
diff -ru libquicktime-0.9.2pre1/utils/rechunk.c libquicktime-0.9.2pre1-patched/utils/rechunk.c
--- libquicktime-0.9.2pre1/utils/rechunk.c	Fri Mar  1 05:17:59 2002
+++ libquicktime-0.9.2pre1-patched/utils/rechunk.c	Fri Sep 20 11:42:15 2002
@@ -1,5 +1,5 @@
 #include <funcprotos.h>
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 
 #include <string.h>
 
diff -ru libquicktime-0.9.2pre1/utils/recover.c libquicktime-0.9.2pre1-patched/utils/recover.c
--- libquicktime-0.9.2pre1/utils/recover.c	Mon Apr  8 14:32:58 2002
+++ libquicktime-0.9.2pre1-patched/utils/recover.c	Fri Sep 20 11:42:15 2002
@@ -1,5 +1,5 @@
 #include <funcprotos.h>
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff -ru libquicktime-0.9.2pre1/utils/test_codec.c libquicktime-0.9.2pre1-patched/utils/test_codec.c
--- libquicktime-0.9.2pre1/utils/test_codec.c	Sun Mar  3 22:01:14 2002
+++ libquicktime-0.9.2pre1-patched/utils/test_codec.c	Fri Sep 20 11:42:16 2002
@@ -3,7 +3,7 @@
  * installed libquicktime codecs
  ***************************************************/
 
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 #include <quicktime/lqt.h>
 #include <lqt_codecinfo_private.h>
 
diff -ru libquicktime-0.9.2pre1/utils/testqt.c libquicktime-0.9.2pre1-patched/utils/testqt.c
--- libquicktime-0.9.2pre1/utils/testqt.c	Tue May 21 05:13:21 2002
+++ libquicktime-0.9.2pre1-patched/utils/testqt.c	Fri Sep 20 11:42:16 2002
@@ -47,7 +47,7 @@
 		unsigned char *pFrameBufferLinear;
 		int iFrameNum = 0;
 		int iSamplesPerFrame =
-			ceilf( quicktime_sample_rate( pxQuicktimeInput, 0 ) / fFrameRate );
+			ceil( quicktime_sample_rate( pxQuicktimeInput, 0 ) / fFrameRate );
 		int iNAudioOutputs = lqt_total_channels( pxQuicktimeInput );
 		FILE **pxAudioOutputs;
 		int16_t **ppiAudioBuffer;
@@ -55,7 +55,7 @@
 
 		if( fFrameRate <= 0 )
 			iSamplesPerFrame = 
-				ceilf( quicktime_sample_rate( pxQuicktimeInput, 0 ) );
+				ceil( quicktime_sample_rate( pxQuicktimeInput, 0 ) );
 		
 
 		{
diff -ru libquicktime-0.9.2pre1/utils/yuv4toyuv.c libquicktime-0.9.2pre1-patched/utils/yuv4toyuv.c
--- libquicktime-0.9.2pre1/utils/yuv4toyuv.c	Wed Feb 27 23:18:25 2002
+++ libquicktime-0.9.2pre1-patched/utils/yuv4toyuv.c	Fri Sep 20 11:42:16 2002
@@ -1,4 +1,4 @@
-#include <quicktime/quicktime.h>
+#include "quicktime/quicktime.h"
 
 int usage(void)
 {