diff --git a/autobuild.xml b/autobuild.xml
index 9745595555..183a051e5a 100755
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -3618,7 +3618,6 @@
                 <array>
                   <string>--fmodex</string>
                   <string>--kdu</string>
-                  <string>--quicktime</string>
                   <string>--version</string>
                   <string>--platform win32</string>
                 </array>
@@ -3655,7 +3654,6 @@
                 <array>
                   <string>--fmodex</string>
                   <string>--kdu</string>
-                  <string>--quicktime</string>
                   <string>--version</string>
                   <string>--platform win32</string>
                 </array>
@@ -3692,7 +3690,6 @@
                 <array>
                   <string>--fmodex</string>
                   <string>--kdu</string>
-                  <string>--quicktime</string>
                   <string>--version</string>
                   <string>--platform win32</string>
                 </array>
diff --git a/indra/media_plugins/gstreamer10/CMakeLists.txt b/indra/media_plugins/gstreamer10/CMakeLists.txt
index 4f975d7823..3a98df5da1 100644
--- a/indra/media_plugins/gstreamer10/CMakeLists.txt
+++ b/indra/media_plugins/gstreamer10/CMakeLists.txt
@@ -62,11 +62,11 @@ target_link_libraries(media_plugin_gstreamer10
   ${GSTREAMER10_LIBRARIES}
 )
 
-add_dependencies(media_plugin_gstreamer10
-  ${LLPLUGIN_LIBRARIES}
-  ${MEDIA_PLUGIN_BASE_LIBRARIES}
-  ${LLCOMMON_LIBRARIES}
-)
+#add_dependencies(media_plugin_gstreamer10
+#  ${LLPLUGIN_LIBRARIES}
+#  ${MEDIA_PLUGIN_BASE_LIBRARIES}
+#  ${LLCOMMON_LIBRARIES}
+#)
 
 if (WINDOWS)
   set_target_properties(
diff --git a/indra/media_plugins/libvlc/CMakeLists.txt b/indra/media_plugins/libvlc/CMakeLists.txt
index 7c51e35805..30071c0c43 100644
--- a/indra/media_plugins/libvlc/CMakeLists.txt
+++ b/indra/media_plugins/libvlc/CMakeLists.txt
@@ -56,11 +56,11 @@ target_link_libraries(media_plugin_libvlc
   ${PLUGIN_API_WINDOWS_LIBRARIES}
 )
 
-add_dependencies(media_plugin_libvlc
-  ${LLPLUGIN_LIBRARIES}
-  ${MEDIA_PLUGIN_BASE_LIBRARIES}
-  ${LLCOMMON_LIBRARIES}
-)
+#add_dependencies(media_plugin_libvlc
+#  ${LLPLUGIN_LIBRARIES}
+#  ${MEDIA_PLUGIN_BASE_LIBRARIES}
+#  ${LLCOMMON_LIBRARIES}
+#)
 
 if (WINDOWS)
   set_target_properties(
diff --git a/scripts/configure_firestorm.sh b/scripts/configure_firestorm.sh
index 3d29e2b95d..fac6f5f159 100755
--- a/scripts/configure_firestorm.sh
+++ b/scripts/configure_firestorm.sh
@@ -34,7 +34,6 @@ WANTS_PACKAGE=$FALSE
 WANTS_VERSION=$FALSE
 WANTS_KDU=$FALSE
 WANTS_FMODEX=$FALSE
-WANTS_QUICKTIME=$FALSE
 WANTS_OPENSIM=$TRUE
 WANTS_AVX=$FALSE
 WANTS_AVX2=$FALSE
@@ -101,7 +100,6 @@ getArgs()
                       ;;
           kdu)        WANTS_KDU=$TRUE;;
           fmodex)     WANTS_FMODEX=$TRUE;;
-          quicktime)  WANTS_QUICKTIME=$TRUE;;
           opensim)    WANTS_OPENSIM=$TRUE;;
           no-opensim) WANTS_OPENSIM=$FALSE;;
           avx)        WANTS_AVX=$TRUE;;
@@ -279,7 +277,6 @@ echo -e "configure_firestorm.py" > $LOG
 echo -e "    PLATFORM: '$PLATFORM'"            | tee -a $LOG
 echo -e "         KDU: `b2a $WANTS_KDU`"       | tee -a $LOG
 echo -e "      FMODEX: `b2a $WANTS_FMODEX`"    | tee -a $LOG
-echo -e "   QUICKTIME: `b2a $WANTS_QUICKTIME`" | tee -a $LOG
 echo -e "     OPENSIM: `b2a $WANTS_OPENSIM`"   | tee -a $LOG
 echo -e "         AVX: `b2a $WANTS_AVX` "      | tee -a $LOG
 echo -e "        AVX2: `b2a $WANTS_AVX2` "     | tee -a $LOG
@@ -379,16 +376,6 @@ if [ $WANTS_CONFIG -eq $TRUE ] ; then
         FMODEX="-DFMODEX:BOOL=OFF"
     fi
 	
-    if [ $PLATFORM == "win32" ] ; then
-      if [ $WANTS_QUICKTIME -eq $TRUE ] ; then
-          QUICKTIME="-DHAVE_QUICKTIME_3P:BOOL=ON"
-      else
-          QUICKTIME="-DHAVE_QUICKTIME_3P:BOOL=OFF"
-      fi
-	else
-		QUICKTIME=""
-	fi
-	
     if [ $WANTS_OPENSIM -eq $TRUE ] ; then
         OPENSIM="-DOPENSIM:BOOL=ON"
     else
@@ -459,7 +446,7 @@ if [ $WANTS_CONFIG -eq $TRUE ] ; then
         UNATTENDED="-DUNATTENDED=ON"
     fi
 
-    cmake -G "$TARGET" ../indra $CHANNEL $FMODEX $QUICKTIME $KDU $OPENSIM $AVX_OPTIMIZATION $AVX2_OPTIMIZATION $PACKAGE $UNATTENDED -DLL_TESTS:BOOL=OFF -DWORD_SIZE:STRING=$WORD_SIZE -DCMAKE_BUILD_TYPE:STRING=$BTYPE \
+    cmake -G "$TARGET" ../indra $CHANNEL $FMODEX $KDU $OPENSIM $AVX_OPTIMIZATION $AVX2_OPTIMIZATION $PACKAGE $UNATTENDED -DLL_TESTS:BOOL=OFF -DWORD_SIZE:STRING=$WORD_SIZE -DCMAKE_BUILD_TYPE:STRING=$BTYPE \
           -DNDTARGET_ARCH:STRING="${TARGET_ARCH}" -DROOT_PROJECT_NAME:STRING=Firestorm $LL_ARGS_PASSTHRU | tee $LOG
 
     if [ $PLATFORM == "win32" ] ; then