diff --git a/CMakeModules/FindFreeType.cmake b/CMakeModules/FindFreeType.cmake
index 8ba8f0816..b42cd8ce4 100644
--- a/CMakeModules/FindFreeType.cmake
+++ b/CMakeModules/FindFreeType.cmake
@@ -25,55 +25,92 @@
 # I'm going to attempt to cut out the middleman and hope 
 # everything still works.
 FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h 
-    $ENV{FREETYPE_DIR}
-    /usr/local/include
-    /usr/include
-    /usr/local/X11R6
-    /usr/X11R6/include
-    /sw/include
-    /opt/local/include
-    /opt/csw/include
-    /opt/include
-    /usr/freeware/include/freetype2
+  $ENV{FREETYPE_DIR}
+  NO_DEFAULT_PATH
+  PATH_SUFFIXES include    
+)
+FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h 
+  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
+  NO_DEFAULT_PATH
+  PATH_SUFFIXES include
+)
+FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h 
+  PATHS
+  /usr/local
+  /usr
+  /usr/local/X11R6
+  /usr/local/X11
+  /usr/X11R6
+  /usr/X11
+  /sw
+  /opt/local
+  /opt/csw
+  /opt
+  /usr/freeware
+  PATH_SUFFIXES include
 )
 
 FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h 
-    $ENV{FREETYPE_DIR}/include/freetype2
-    /usr/local/include/freetype2
-    /usr/include/freetype2
-    /usr/local/X11R6/include/freetype2
-    /usr/X11R6/include/freetype2
-    /sw/include/freetype2
-    /opt/local/include/freetype2
-    /opt/csw/include/freetype2
-    /opt/include/freetype2
-    /usr/freeware/include/freetype2
+  $ENV{FREETYPE_DIR}/include/freetype2
+  NO_DEFAULT_PATH
+)
+FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h 
+  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
+  NO_DEFAULT_PATH
+  PATH_SUFFIXES include/freetype2
+)
+FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h 
+  /usr/local/include/freetype2
+  /usr/include/freetype2
+  /usr/local/X11R6/include/freetype2
+  /usr/local/X11/include/freetype2
+  /usr/X11R6/include/freetype2
+  /usr/X11/include/freetype2
+  /sw/include/freetype2
+  /opt/local/include/freetype2
+  /opt/csw/include/freetype2
+  /opt/include/freetype2
+  /usr/freeware/include/freetype2
 )
 
 FIND_LIBRARY(FREETYPE_LIBRARY 
-    NAMES freetype libfreetype freetype219
-    PATHS
-    $ENV{FREETYPE_DIR}/lib
-    $ENV{FREETYPE_DIR}/lib
-    /usr/local/lib
-    /usr/lib
-    /usr/local/X11R6/lib
-    /usr/X11R6/lib
-    /sw/lib
-    /opt/local/lib
-    /opt/csw/lib
-    /opt/lib
-    /usr/freeware/lib64
+  NAMES freetype libfreetype freetype219
+  PATHS
+  $ENV{FREETYPE_DIR}
+  NO_DEFAULT_PATH
+  PATH_SUFFIXES lib64 lib 
+)
+FIND_LIBRARY(FREETYPE_LIBRARY 
+  NAMES freetype libfreetype freetype219
+  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
+  NO_DEFAULT_PATH
+  PATH_SUFFIXES lib64 lib 
+)
+FIND_LIBRARY(FREETYPE_LIBRARY 
+  NAMES freetype libfreetype freetype219
+  PATHS
+  /usr/local
+  /usr
+  /usr/local/X11R6
+  /usr/local/X11
+  /usr/X11R6
+  /usr/X11
+  /sw
+  /opt/local
+  /opt/csw
+  /opt
+  /usr/freeware
+  PATH_SUFFIXES lib64 lib
 )
 
 IF(FREETYPE_INCLUDE_DIR_ft2build AND FREETYPE_INCLUDE_DIR_freetype2)
-    SET(FREETYPE_INCLUDE_DIRS "${FREETYPE_INCLUDE_DIR_ft2build};${FREETYPE_INCLUDE_DIR_freetype2}")
+  SET(FREETYPE_INCLUDE_DIRS "${FREETYPE_INCLUDE_DIR_ft2build};${FREETYPE_INCLUDE_DIR_freetype2}")
 ENDIF(FREETYPE_INCLUDE_DIR_ft2build AND FREETYPE_INCLUDE_DIR_freetype2)
 
 
 SET(FREETYPE_FOUND "NO")
 IF(FREETYPE_LIBRARY AND FREETYPE_INCLUDE_DIRS)
-    SET(FREETYPE_FOUND "YES")
+  SET(FREETYPE_FOUND "YES")
 ENDIF(FREETYPE_LIBRARY AND FREETYPE_INCLUDE_DIRS)
 
 
diff --git a/CMakeModules/FindGDAL.cmake b/CMakeModules/FindGDAL.cmake
index 70254cab7..14c075a1f 100644
--- a/CMakeModules/FindGDAL.cmake
+++ b/CMakeModules/FindGDAL.cmake
@@ -4,55 +4,90 @@
 # GDAL_FOUND, if false, do not try to link to gdal 
 # GDAL_INCLUDE_DIR, where to find the headers
 #
-# $GDAL_DIR is an environment variable that would
+# $GDALDIR is an environment variable that would
 # correspond to the ./configure --prefix=$GDAL_DIR
+# used in building gdal.
 #
-# Created by Robert Osfield. 
+# Created by Eric Wing. I'm not a gdal user, but OpenSceneGraph uses it 
+# for osgTerrain so I whipped this module together for completeness.
+# I actually don't know the conventions or where files are typically
+# placed in distros.
+# Any real gdal users are encouraged to correct this (but please don't
+# break the OS X framework stuff when doing so which is what usually seems 
+# to happen).
+
+# This makes the presumption that you are include gdal.h like
+# #include "gdal.h"
 
 FIND_PATH(GDAL_INCLUDE_DIR gdal.h
-    ${GDAL_DIR}/include
-    $ENV{GDAL_DIR}/include
-    $ENV{GDAL_DIR}
-    $ENV{OSGDIR}/include
-    $ENV{OSGDIR}
-    $ENV{OSG_ROOT}/include
-    ~/Library/Frameworks
-    /Library/Frameworks
-    /usr/local/include
-    /usr/include
-    /usr/include/gdal
-    /sw/include # Fink
-    /opt/local/include # DarwinPorts
-    /opt/csw/include # Blastwave
-    /opt/include
-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
-    /usr/freeware/include
+  $ENV{GDAL_DIR}
+  NO_DEFAULT_PATH
+    PATH_SUFFIXES include
+)
+
+FIND_PATH(GDAL_INCLUDE_DIR gdal.h
+    PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
+    NO_DEFAULT_PATH
+    PATH_SUFFIXES include
+)
+
+FIND_PATH(GDAL_INCLUDE_DIR gdal.h
+  PATHS
+  ~/Library/Frameworks/gdal.framework/Headers
+  /Library/Frameworks/gdal.framework/Headers
+  /usr/local/include/gdal
+  /usr/local/include/GDAL
+  /usr/local/include
+  /usr/include/gdal
+  /usr/include/GDAL
+  /usr/include
+  /sw/include/gdal 
+  /sw/include/GDAL 
+  /sw/include # Fink
+  /opt/local/include/gdal
+  /opt/local/include/GDAL
+  /opt/local/include # DarwinPorts
+  /opt/csw/include/gdal
+  /opt/csw/include/GDAL
+  /opt/csw/include # Blastwave
+  /opt/include/gdal
+  /opt/include/GDAL
+  /opt/include
 )
 
 FIND_LIBRARY(GDAL_LIBRARY 
-    NAMES gdal gdal_i gdal1.4.0 gdal1.3.2
-    PATHS
-    ${GDAL_DIR}/lib
-    $ENV{GDAL_DIR}/lib
-    $ENV{GDAL_DIR}
-    $ENV{OSGDIR}/lib
-    $ENV{OSGDIR}
-    $ENV{OSG_ROOT}/lib
+  NAMES gdal GDAL
+  PATHS
+  $ENV{GDAL_DIR}
+  NO_DEFAULT_PATH
+  PATH_SUFFIXES lib64 lib
+)
+FIND_LIBRARY(GDAL_LIBRARY 
+  NAMES gdal GDAL
+  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
+    NO_DEFAULT_PATH
+    PATH_SUFFIXES lib64 lib
+)
+FIND_LIBRARY(GDAL_LIBRARY 
+  NAMES gdal GDAL
+  PATHS
     ~/Library/Frameworks
     /Library/Frameworks
-    /usr/local/lib
-    /usr/lib
-    /sw/lib
-    /opt/local/lib
-    /opt/csw/lib
-    /opt/lib
-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
-    /usr/freeware/lib64
+    /usr/local
+    /usr
+    /sw
+    /opt/local
+    /opt/csw
+    /opt
+    /usr/freeware
+    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;GDAL_ROOT]/lib
+  PATH_SUFFIXES lib64 lib
 )
 
 SET(GDAL_FOUND "NO")
 IF(GDAL_LIBRARY AND GDAL_INCLUDE_DIR)
-    SET(GDAL_FOUND "YES")
+  SET(GDAL_FOUND "YES")
 ENDIF(GDAL_LIBRARY AND GDAL_INCLUDE_DIR)
 
 
+
diff --git a/CMakeModules/FindGIFLIB.cmake b/CMakeModules/FindGIFLIB.cmake
index 250caadbd..b2b2f23c1 100644
--- a/CMakeModules/FindGIFLIB.cmake
+++ b/CMakeModules/FindGIFLIB.cmake
@@ -1,56 +1,74 @@
-# Locate gdal
 # This module defines
 # GIFLIB_LIBRARY
-# GIFLIB_FOUND, if false, do not try to link to gdal 
+# GIFLIB_FOUND, if false, do not try to link 
 # GIFLIB_INCLUDE_DIR, where to find the headers
 #
 # $GIFLIB_DIR is an environment variable that would
 # correspond to the ./configure --prefix=$GIFLIB_DIR
-# used in building gdal.
 #
 # Created by Eric Wing. 
 
 FIND_PATH(GIFLIB_INCLUDE_DIR gif_lib.h
-    $ENV{GIFLIB_DIR}/include
-    $ENV{GIFLIB_DIR}
-    $ENV{OSGDIR}/include
-    $ENV{OSGDIR}
-    $ENV{OSG_ROOT}/include
-    ~/Library/Frameworks
-    /Library/Frameworks
-    /usr/local/include
-    /usr/include
-    /sw/include # Fink
-    /opt/local/include # DarwinPorts
-    /opt/csw/include # Blastwave
-    /opt/include
-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
-    /usr/freeware/include
+  PATHS
+  $ENV{GIFLIB_DIR}
+  NO_DEFAULT_PATH
+  PATH_SUFFIXES include
+)
+
+FIND_PATH(GIFLIB_INCLUDE_DIR gif_lib.h
+  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
+  NO_DEFAULT_PATH
+  PATH_SUFFIXES include
+)
+
+FIND_PATH(GIFLIB_INCLUDE_DIR gif_lib.h
+  PATHS
+  ~/Library/Frameworks
+  /Library/Frameworks
+  /usr/local/include
+  /usr/include
+  /sw/include # Fink
+  /opt/local/include # DarwinPorts
+  /opt/csw/include # Blastwave
+  /opt/include
+  [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
+  /usr/freeware/include
 )
 
 FIND_LIBRARY(GIFLIB_LIBRARY 
-    NAMES gif ungif libgif libungif
-    PATHS
-    $ENV{GIFLIB_DIR}/lib
-    $ENV{GIFLIB_DIR}
-    $ENV{OSGDIR}/lib
-    $ENV{OSGDIR}
-    $ENV{OSG_ROOT}/lib
-    ~/Library/Frameworks
-    /Library/Frameworks
-    /usr/local/lib
-    /usr/lib
-    /sw/lib
-    /opt/local/lib
-    /opt/csw/lib
-    /opt/lib
-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
-    /usr/freeware/lib64
+  NAMES gif ungif libgif libungif
+  PATHS
+  $ENV{GIFLIB_DIR}
+  NO_DEFAULT_PATH
+  PATH_SUFFIXES lib64 lib
+)
+
+FIND_LIBRARY(GIFLIB_LIBRARY 
+  NAMES gif ungif libgif libungif
+  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
+  NO_DEFAULT_PATH
+  PATH_SUFFIXES lib64 lib
+)
+
+FIND_LIBRARY(GIFLIB_LIBRARY 
+  NAMES gif ungif libgif libungif
+  PATHS
+  ~/Library/Frameworks
+  /Library/Frameworks
+  /usr/local
+  /usr
+  /sw
+  /opt/local
+  /opt/csw
+  /opt
+  [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
+  /usr/freeware
+  PATH_SUFFIXES lib64 lib
 )
 
 SET(GIFLIB_FOUND "NO")
 IF(GIFLIB_LIBRARY AND GIFLIB_INCLUDE_DIR)
-    SET(GIFLIB_FOUND "YES")
+  SET(GIFLIB_FOUND "YES")
 ENDIF(GIFLIB_LIBRARY AND GIFLIB_INCLUDE_DIR)
 
 
diff --git a/CMakeModules/FindOpenThreads.cmake b/CMakeModules/FindOpenThreads.cmake
index 05f07e9b8..ffbad8323 100644
--- a/CMakeModules/FindOpenThreads.cmake
+++ b/CMakeModules/FindOpenThreads.cmake
@@ -43,36 +43,36 @@
 # may change.
 
 FIND_PATH(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
+    PATHS
     $ENV{OPENTHREADS_INCLUDE_DIR}
     $ENV{OPENTHREADS_DIR}/include
     $ENV{OPENTHREADS_DIR}
     $ENV{OSG_INCLUDE_DIR}
     $ENV{OSG_DIR}/include
     $ENV{OSG_DIR}
+    $ENV{OSGDIR}/include
+    $ENV{OSGDIR}
     NO_DEFAULT_PATH
 )
 
-IF(NOT OPENTHREADS_INCLUDE_DIR)
-    FIND_PATH(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
-        PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-        PATH_SUFFIXES include
-    )
-ENDIF(NOT OPENTHREADS_INCLUDE_DIR)
+FIND_PATH(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
+    PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
+    NO_DEFAULT_PATH
+    PATH_SUFFIXES include
+)
 
-IF(NOT OPENTHREADS_INCLUDE_DIR)
-    FIND_PATH(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
-        ~/Library/Frameworks
-        /Library/Frameworks
-        /usr/local/include
-        /usr/include
-        /sw/include # Fink
-        /opt/local/include # DarwinPorts
-        /opt/csw/include # Blastwave
-        /opt/include
-        [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]/include
-        [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
-    )
-ENDIF(NOT OPENTHREADS_INCLUDE_DIR)
+FIND_PATH(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
+    ~/Library/Frameworks
+    /Library/Frameworks
+    /usr/local/include
+    /usr/include
+    /sw/include # Fink
+    /opt/local/include # DarwinPorts
+    /opt/csw/include # Blastwave
+    /opt/include
+    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]/include
+    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
+)
 
 
 FIND_LIBRARY(OPENTHREADS_LIBRARY 
@@ -86,39 +86,39 @@ FIND_LIBRARY(OPENTHREADS_LIBRARY
     $ENV{OSG_DIR}/lib64
     $ENV{OSG_DIR}/lib
     $ENV{OSG_DIR}
+    $ENV{OSGDIR}/lib64
+    $ENV{OSGDIR}/lib
+    $ENV{OSGDIR}
     NO_DEFAULT_PATH
 )
 
-IF(NOT OPENTHREADS_LIBRARY)
-    FIND_LIBRARY(OPENTHREADS_LIBRARY 
-        NAMES OpenThreads OpenThreadsWin32 
-        PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-        PATH_SUFFIXES lib64 lib
-    )
-ENDIF(NOT OPENTHREADS_LIBRARY)
+FIND_LIBRARY(OPENTHREADS_LIBRARY 
+    NAMES OpenThreads OpenThreadsWin32 
+  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
+    NO_DEFAULT_PATH
+    PATH_SUFFIXES lib64 lib
+)
 
-IF(NOT OPENTHREADS_LIBRARY)
-    FIND_LIBRARY(OPENTHREADS_LIBRARY 
-        NAMES OpenThreads OpenThreadsWin32 
-        PATHS
-        ~/Library/Frameworks
-        /Library/Frameworks
-        /usr/local/lib64
-        /usr/local/lib
-        /usr/lib64
-        /usr/lib
-        /sw/lib64
-        /sw/lib
-        /opt/local/lib64
-        /opt/local/lib
-        /opt/csw/lib64
-        /opt/csw/lib
-        /opt/lib64
-        /opt/lib
-        [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]/lib
-        [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
-    )
-ENDIF(NOT OPENTHREADS_LIBRARY)
+FIND_LIBRARY(OPENTHREADS_LIBRARY 
+    NAMES OpenThreads OpenThreadsWin32 
+    PATHS
+    ~/Library/Frameworks
+    /Library/Frameworks
+    /usr/local/lib64
+    /usr/local/lib
+    /usr/lib64
+    /usr/lib
+    /sw/lib64
+    /sw/lib
+    /opt/local/lib64
+    /opt/local/lib
+    /opt/csw/lib64
+    /opt/csw/lib
+    /opt/lib64
+    /opt/lib
+    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]/lib
+    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
+)
 
 
 FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG 
@@ -133,40 +133,37 @@ FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG
     $ENV{OSG_DIR}/lib64
     $ENV{OSG_DIR}/lib
     $ENV{OSG_DIR}
-    ${CMAKE_PREFIX_PATH}/lib64
-    ${CMAKE_PREFIX_PATH}/lib
-    ${CMAKE_PREFIX_PATH}
+    $ENV{OSGDIR}/lib64
+    $ENV{OSGDIR}/lib
+    $ENV{OSGDIR}
     NO_DEFAULT_PATH
 )
 
-IF(NOT OPENTHREADS_LIBRARY_DEBUG)
-    FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG 
-        NAMES OpenThreadsd OpenThreadsWin32d
-        PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-        PATH_SUFFIXES lib64 lib
-    )
-ENDIF(NOT OPENTHREADS_LIBRARY_DEBUG)
+FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG 
+    NAMES OpenThreadsd OpenThreadsWin32d
+    PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
+    NO_DEFAULT_PATH
+    PATH_SUFFIXES lib64 lib
+)
 
-IF(NOT OPENTHREADS_LIBRARY_DEBUG)
-    FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG 
-        NAMES OpenThreadsd OpenThreadsWin32d
-        PATHS
-        /usr/local/lib64
-        /usr/local/lib
-        /usr/lib64
-        /usr/lib
-        /sw/lib64
-        /sw/lib
-        /opt/local/lib64
-        /opt/local/lib
-        /opt/csw/lib64
-        /opt/csw/lib
-        /opt/lib64
-        /opt/lib
-        [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]/lib
-        [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
-    )
-ENDIF(NOT OPENTHREADS_LIBRARY_DEBUG)
+FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG 
+    NAMES OpenThreadsd OpenThreadsWin32d
+    PATHS
+    /usr/local/lib64
+    /usr/local/lib
+    /usr/lib64
+    /usr/lib
+    /sw/lib64
+    /sw/lib
+    /opt/local/lib64
+    /opt/local/lib
+    /opt/csw/lib64
+    /opt/csw/lib
+    /opt/lib64
+    /opt/lib
+    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]/lib
+    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
+)
 
 
 IF(OPENTHREADS_LIBRARY)
diff --git a/CMakeModules/FindQuickTime.cmake b/CMakeModules/FindQuickTime.cmake
index 6fc1af57f..17ae700bf 100644
--- a/CMakeModules/FindQuickTime.cmake
+++ b/CMakeModules/FindQuickTime.cmake
@@ -6,7 +6,6 @@
 #
 # $QUICKTIME_DIR is an environment variable that would
 # correspond to the ./configure --prefix=$QUICKTIME_DIR
-# used in building gdal.
 #
 # Created by Eric Wing. 
 
@@ -14,19 +13,37 @@
 # so I am going to case the two.
 
 IF(APPLE)
-    FIND_PATH(QUICKTIME_INCLUDE_DIR QuickTime/QuickTime.h)
-    FIND_LIBRARY(QUICKTIME_LIBRARY QuickTime)
+  FIND_PATH(QUICKTIME_INCLUDE_DIR QuickTime/QuickTime.h)
+  FIND_LIBRARY(QUICKTIME_LIBRARY QuickTime)
 ELSE(APPLE)
-    FIND_PATH(QUICKTIME_INCLUDE_DIR QuickTime.h
-        $ENV{QUICKTIME_DIR}/include
-        $ENV{QUICKTIME_DIR}
-    )
-    FIND_LIBRARY(QUICKTIME_LIBRARY QuickTime)
+  FIND_PATH(QUICKTIME_INCLUDE_DIR QuickTime.h
+    $ENV{QUICKTIME_DIR}/include
+    $ENV{QUICKTIME_DIR}
+    NO_DEFAULT_PATH
+  )
+  FIND_PATH(QUICKTIME_INCLUDE_DIR QuickTime.h
+    PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
+    NO_DEFAULT_PATH
+    PATH_SUFFIXES include
+  )
+  FIND_PATH(QUICKTIME_INCLUDE_DIR QuickTime.h)
+
+  FIND_LIBRARY(QUICKTIME_LIBRARY QuickTime
+    $ENV{QUICKTIME_DIR}/lib
+    $ENV{QUICKTIME_DIR}
+    NO_DEFAULT_PATH
+  )
+  FIND_LIBRARY(QUICKTIME_LIBRARY QuickTime
+    PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
+    NO_DEFAULT_PATH
+    PATH_SUFFIXES lib64 lib
+  )
+  FIND_LIBRARY(QUICKTIME_LIBRARY QuickTime)
 ENDIF(APPLE)
 
 SET(QUICKTIME_FOUND "NO")
 IF(QUICKTIME_LIBRARY AND QUICKTIME_INCLUDE_DIR)
-    SET(QUICKTIME_FOUND "YES")
+  SET(QUICKTIME_FOUND "YES")
 ENDIF(QUICKTIME_LIBRARY AND QUICKTIME_INCLUDE_DIR)