BUG: Fixed modules to set FOO_FOUND when both headers and libraries are found.

BUG: FindSDL now has flag it responds to so it will not find/link against SDLmain. This is required to build libraries instead of applications since they don't have main().
ENH: All modules have a predictable search order, where environmental variables are searched before system paths. This is designed to make automation easier for those that need to automatically build projects without intervention but may be using alternative install locations for isolated testing.
ENH: New modules for OpenSceneGraph, Freetype, GDAL, Lua, QuickTime, GIFLIB, Producer, OpenThreads.
STYLE: Added documentation explaining peculuar SDL_LIBRARY_TEMP variable in SDL
  module when library find is incomplete.

1 files changed, 201 insertions, 393 deletions

diff --git a/Modules/FindSDL_sound.cmake b/Modules/FindSDL_sound.cmake
index 62be3ee6db..64a0d5faf2 100644
--- a/Modules/FindSDL_sound.cmake
+++ b/Modules/FindSDL_sound.cmake
@@ -1,7 +1,8 @@
-# - Locates the SDL_sound library
+# Locates the SDL_sound library
+
 # This module depends on SDL being found and 
 # must be called AFTER FindSDL.cmake is called.
-#
+
 # This module defines
 # SDL_SOUND_INCLUDE_DIR, where to find SDL_sound.h
 # SDL_SOUND_FOUND, if false, do not try to link to SDL
@@ -11,48 +12,48 @@
 # flags to SDL_SOUND_LIBRARIES. This is prepended to SDL_SOUND_LIBRARIES.
 # This is available mostly for cases this module failed to anticipate for
 # and you must add additional flags. This is marked as ADVANCED.
+ 
 #
 # This module also defines (but you shouldn't need to use directly)
 # SDL_SOUND_LIBRARY, the name of just the SDL_sound library you would link
 # against. Use SDL_SOUND_LIBRARIES for you link instructions and not this one.
 # And might define the following as needed
-#  MIKMOD_LIBRARY
-#  MODPLUG_LIBRARY
-#  OGG_LIBRARY
-#  VORBIS_LIBRARY
-#  SMPEG_LIBRARY
-#  FLAC_LIBRARY
-#  SPEEX_LIBRARY
+# MIKMOD_LIBRARY
+# MODPLUG_LIBRARY
+# OGG_LIBRARY
+# VORBIS_LIBRARY
+# SMPEG_LIBRARY
+# FLAC_LIBRARY
+# SPEEX_LIBRARY
 #
-# Typically, you should not use these variables directly, and you should use
-# SDL_SOUND_LIBRARIES which contains SDL_SOUND_LIBRARY and the other audio
-# libraries (if needed) to successfully compile on your system .
+# Typically, you should not use these variables directly, and you should use 
+# SDL_SOUND_LIBRARIES which contains SDL_SOUND_LIBRARY and the other audio libraries 
+# (if needed) to successfully compile on your system . 
 #
 # Created by Eric Wing. 
+# This module is a bit more complicated than the other FindSDL* family modules.
+# The reason is that SDL_sound can be compiled in a large variety of different ways
+# which are independent of platform. SDL_sound may dynamically link against other 3rd
+# party libraries to get additional codec support, such as Ogg Vorbis, SMPEG, ModPlug,
+# MikMod, FLAC, Speex, and potentially others. 
+# Under some circumstances which I don't fully understand, 
+# there seems to be a requirement
+# that dependent libraries of libraries you use must also be explicitly 
+# linked against in order to successfully compile. SDL_sound does not currently 
+# have any system in place to know how it was compiled.
+# So this CMake module does the hard work in trying to discover which 3rd party 
+# libraries are required for building (if any).
+# This module uses a brute force approach to create a test program that uses SDL_sound,
+# and then tries to build it. If the build fails, it parses the error output for 
+# known symbol names to figure out which libraries are needed.
 #
-# This module is a bit more complicated than the other FindSDL* family
-# modules.  The reason is that SDL_sound can be compiled in a large variety
-# of different ways which are independent of platform. SDL_sound may
-# dynamically link against other 3rd party libraries to get additional codec
-# support, such as Ogg Vorbis, SMPEG, ModPlug, MikMod, FLAC, Speex, and
-# potentially others.  Under some circumstances which I don't fully
-# understand, there seems to be a requirement that dependent libraries of
-# libraries you use must also be explicitly linked against in order to
-# successfully compile. SDL_sound does not currently have any system in place
-# to know how it was compiled.  So this CMake module does the hard work in
-# trying to discover which 3rd party libraries are required for building (if
-# any).
-#
-# This module uses a brute force approach to create a test program that uses
-# SDL_sound, and then tries to build it. If the build fails, it parses the
-# error output for known symbol names to figure out which libraries are
-# needed.  Responds to the $SDLDIR and $SDLSOUNDDIR environmental variable
-# that would correspond to the ./configure --prefix=$SDLDIR used in building
-# SDL.
+# Responds to the $SDLDIR and $SDLSOUNDDIR environmental variable that would
+# correspond to the ./configure --prefix=$SDLDIR used in building SDL.
 #
 # On OSX, this will prefer the Framework version (if found) over others.
 # People will have to manually change the cache values of 
-# SDL_LIBRARY to override this selection.
+# SDL_LIBRARY to override this selectionor set the CMake environment
+# CMAKE_INCLUDE_PATH to modify the search paths.
 #
 
 
@@ -62,9 +63,15 @@ MARK_AS_ADVANCED(SDL_SOUND_EXTRAS)
 # Find SDL_sound.h
 FIND_PATH(SDL_SOUND_INCLUDE_DIR SDL_sound.h
   $ENV{SDLSOUNDDIR}/include
+  $ENV{SDLSOUNDDIR}
   $ENV{SDLDIR}/include
-  ~/Library/Frameworks/SDL_sound.framework/Headers
-  /Library/Frameworks/SDL_sound.framework/Headers # OS X
+  $ENV{SDLDIR}
+  NO_DEFAULT_PATH
+)
+FIND_PATH(SDL_SOUND_INCLUDE_DIR SDL_sound.h
+  NO_DEFAULT_PATH
+)
+FIND_PATH(SDL_SOUND_INCLUDE_DIR SDL_sound.h
   /usr/local/include/SDL
   /usr/include/SDL
   /usr/local/include/SDL12
@@ -82,40 +89,21 @@ FIND_PATH(SDL_SOUND_INCLUDE_DIR SDL_sound.h
   /opt/include/SDL
   /opt/include
   )
-# Find the SDL_sound library
-IF(${SDL_SOUND_INCLUDE_DIR} MATCHES ".framework")
-  # Extract the path the framework resides in so we can use it for the -F flag
-  STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" SDL_SOUND_FRAMEWORK_PATH_TMP ${SDL_SOUND_INCLUDE_DIR})
-  IF("${SDL_SOUND_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-      OR "${SDL_SOUND_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-      )
-    # String is in default search path, don't need to use -F
-    SET (SDL_SOUND_LIBRARY "-framework SDL_sound" CACHE STRING "SDL_sound framework for OSX")
-  ELSE("${SDL_SOUND_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-      OR "${SDL_SOUND_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-      )
-    # String is not /Library/Frameworks, need to use -F
-    SET(SDL_SOUND_LIBRARY "-F${SDL_SOUND_FRAMEWORK_PATH_TMP} -framework SDL_sound" CACHE STRING "SDL_sound framework for OSX")
-  ENDIF("${SDL_SOUND_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-    OR "${SDL_SOUND_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-    )
-  # Clear the temp variable so nobody can see it
-  SET(SDL_SOUND_FRAMEWORK_PATH_TMP "" CACHE INTERNAL "")
 
-ELSE(${SDL_SOUND_INCLUDE_DIR} MATCHES ".framework")
-  FIND_LIBRARY(SDL_SOUND_LIBRARY 
-    NAMES SDL_sound
-    PATHS
-    $ENV{SDLSOUNDDIR}/lib
-    $ENV{SDLDIR}/lib
-    /usr/local/lib
-    /usr/lib
-    /sw/lib
-    /opt/local/lib
-    /opt/csw/lib
-    /opt/lib
-    )
-ENDIF(${SDL_SOUND_INCLUDE_DIR} MATCHES ".framework")
+FIND_LIBRARY(SDL_SOUND_LIBRARY 
+  NAMES SDL_sound
+  PATHS
+  $ENV{SDLSOUNDDIR}/lib
+  $ENV{SDLSOUNDDIR}
+  $ENV{SDLDIR}/lib
+  $ENV{SDLDIR}
+  /usr/local/lib
+  /usr/lib
+  /sw/lib
+  /opt/local/lib
+  /opt/csw/lib
+  /opt/lib
+  )
 
 SET(SDL_SOUND_FOUND "NO")
 IF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
@@ -147,7 +135,7 @@ IF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
   # To minimize external dependencies, create a sdlsound test program
   # which will be used to figure out if additional link dependencies are
   # required for the link phase.
-  FILE(WRITE ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/DetermineSoundLibs.c
+  FILE(WRITE ${PROJECT_BINARY_DIR}/CMakeTmp/DetermineSoundLibs.c
     "#include \"SDL_sound.h\"
     #include \"SDL.h\"
     int main(int argc, char* argv[])
@@ -170,29 +158,42 @@ IF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
      }"
      )
 
+   # Calling 
+   # TARGET_LINK_LIBRARIES(DetermineSoundLibs "${SDL_SOUND_LIBRARY} ${SDL_LIBRARY})
+   # causes problems when SDL_LIBRARY looks like
+   # /Library/Frameworks/SDL.framework;-framework Cocoa
+   # The ;-framework Cocoa seems to be confusing CMake once the OS X
+   # framework support was added. I was told that breaking up the list 
+   # would fix the problem.
+   SET(TMP_TRY_LIBS)
+   FOREACH(lib ${SDL_SOUND_LIBRARY} ${SDL_LIBRARY})
+     SET(TMP_TRY_LIBS "${TMP_TRY_LIBS} \"${lib}\"")
+   ENDFOREACH(lib)
 
+   # MESSAGE("TMP_TRY_LIBS ${TMP_TRY_LIBS}")
+   
    # Write the CMakeLists.txt and test project
    # Weird, this is still sketchy. If I don't quote the variables
    # in the TARGET_LINK_LIBRARIES, I seem to loose everything 
    # in the SDL_LIBRARY string after the "-framework".
    # But if I quote the stuff in INCLUDE_DIRECTORIES, it doesn't work.
-   FILE(WRITE ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CMakeLists.txt
+   FILE(WRITE ${PROJECT_BINARY_DIR}/CMakeTmp/CMakeLists.txt
      "PROJECT(DetermineSoundLibs)
         INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR} ${SDL_SOUND_INCLUDE_DIR})
         ADD_EXECUTABLE(DetermineSoundLibs DetermineSoundLibs.c)
-        TARGET_LINK_LIBRARIES(DetermineSoundLibs \"${SDL_SOUND_LIBRARY} ${SDL_LIBRARY}\")"
+        TARGET_LINK_LIBRARIES(DetermineSoundLibs ${TMP_TRY_LIBS})"
      )
 
    TRY_COMPILE( 
      MY_RESULT
-     ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp
-     ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp
+     ${PROJECT_BINARY_DIR}/CMakeTmp
+     ${PROJECT_BINARY_DIR}/CMakeTmp
      DetermineSoundLibs
      OUTPUT_VARIABLE MY_OUTPUT
      )
    
-   #MESSAGE("${MY_RESULT}")
-   #MESSAGE(${MY_OUTPUT})
+   # MESSAGE("${MY_RESULT}")
+   # MESSAGE(${MY_OUTPUT})
    
    IF(NOT MY_RESULT)
      
@@ -204,47 +205,22 @@ IF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
      
      # Find MikMod
      IF("${MY_OUTPUT}" MATCHES "MikMod_")
-       FIND_FILE(TEMP_SDLSOUND_FIND_MIKMOD_FRAMEWORK 
-         libmikmod-coreaudio 
-         ~/Library/Frameworks/libmikmod-coreaudio.framework
-         /Library/Frameworks/libmikmod-coreaudio.framework
-         )
-       IF(TEMP_SDLSOUND_FIND_MIKMOD_FRAMEWORK)
-         # Extract the path the framework resides in so we can use it for the -F flag
-         STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" TEMP_SDLSOUND_MIKMOD_FRAMEWORK_PATH_TMP ${TEMP_SDLSOUND_FIND_MIKMOD_FRAMEWORK})
-         IF("${TEMP_SDLSOUND_MIKMOD_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-             OR "${TEMP_SDLSOUND_MIKMOD_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-             )
-           # It's in the default search path so I don't need to use -F
-           SET(MIKMOD_LIBRARY "-framework libmikmod-coreaudio" CACHE STRING "MikMod framework for OSX")
-         ELSE("${TEMP_SDLSOUND_MIKMOD_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-             OR "${TEMP_SDLSOUND_MIKMOD_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-             )
-           # It's not in the default search path so I need to use -F
-           SET(MIKMOD_LIBRARY "-F${TEMP_SDLSOUND_MIKMOD_FRAMEWORK_PATH_TMP} -framework libmikmod-coreaudio" CACHE STRING "MikMod framework for OSX")
-         ENDIF("${TEMP_SDLSOUND_MIKMOD_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-           OR "${TEMP_SDLSOUND_MIKMOD_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-           )
-         # Clear the temp variable so nobody can see it
-         SET(TEMP_SDLSOUND_MIKMOD_FRAMEWORK_PATH_TMP "" CACHE INTERNAL "")
-
-       ELSE(TEMP_SDLSOUND_FIND_MIKMOD_FRAMEWORK)
-         FIND_LIBRARY(MIKMOD_LIBRARY
-           NAMES mikmod
-           PATHS
-           $ENV{MIKMODDIR}/lib
-           $ENV{SDLSOUNDDIR}/lib
-           $ENV{SDLDIR}/lib
-           /usr/local/lib
-           /usr/lib
-           /sw/lib
-           /opt/local/lib
-           /opt/csw/lib
-           /opt/lib
-           )
-       ENDIF(TEMP_SDLSOUND_FIND_MIKMOD_FRAMEWORK)
-       # Clear the temp variable so nobody can see it
-       SET(TEMP_SDLSOUND_FIND_MIKMOD_FRAMEWORK "" CACHE INTERNAL "")
+     FIND_LIBRARY(MIKMOD_LIBRARY
+         NAMES libmikmod-coreaudio mikmod
+         PATHS
+         $ENV{MIKMODDIR}/lib
+         $ENV{MIKMODDIR}
+         $ENV{SDLSOUNDDIR}/lib
+         $ENV{SDLSOUNDDIR}
+         $ENV{SDLDIR}/lib
+         $ENV{SDLDIR}
+         /usr/local/lib
+         /usr/lib
+         /sw/lib
+         /opt/local/lib
+         /opt/csw/lib
+       /opt/lib
+       ) 
        IF(MIKMOD_LIBRARY)
          SET(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${MIKMOD_LIBRARY})
        ENDIF(MIKMOD_LIBRARY)
@@ -252,48 +228,22 @@ IF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
      
      # Find ModPlug
      IF("${MY_OUTPUT}" MATCHES "MODPLUG_")
-       FIND_FILE(TEMP_SDLSOUND_FIND_MODPLUG_FRAMEWORK 
-         modplug
-         ~/Library/Frameworks/modplug.framework
-         /Library/Frameworks/modplug.framework
-         )
-       IF(TEMP_SDLSOUND_FIND_MODPLUG_FRAMEWORK)
-         # Extract the path the framework resides in so we can use it for the -F flag
-         STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" TEMP_SDLSOUND_MODPLUG_FRAMEWORK_PATH_TMP ${TEMP_SDLSOUND_FIND_MODPLUG_FRAMEWORK})
-         MESSAGE("HELLO")
-         IF("${TEMP_SDLSOUND_MODPLUG_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-             OR "${TEMP_SDLSOUND_MODPLUG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-             )
-           # It's in the default search path so I don't need to use -F
-           SET(MODPLUG_LIBRARY "-framework modplug" CACHE STRING "MODPLUG framework for OSX")
-         ELSE("${TEMP_SDLSOUND_MODPLUG_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-             OR "${TEMP_SDLSOUND_MODPLUG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-             )
-           # It's not in the default search path so I need to use -F
-           SET(MODPLUG_LIBRARY "-F${TEMP_SDLSOUND_MODPLUG_FRAMEWORK_PATH_TMP} -framework modplug" CACHE STRING "MODPLUG framework for OSX")
-         ENDIF("${TEMP_SDLSOUND_MODPLUG_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-           OR "${TEMP_SDLSOUND_MODPLUG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-           )
-         # Clear the temp variable so nobody can see it
-         SET(TEMP_SDLSOUND_MODPLUG_FRAMEWORK_PATH_TMP "" CACHE INTERNAL "")
-         
-       ELSE(TEMP_SDLSOUND_FIND_MODPLUG_FRAMEWORK)
-         FIND_LIBRARY(MODPLUG_LIBRARY
-           NAMES modplug
-           PATHS
-           $ENV{MODPLUGDIR}/lib
-           $ENV{SDLSOUNDDIR}/lib
-           $ENV{SDLDIR}/lib
-           /usr/local/lib
-           /usr/lib
-           /sw/lib
-           /opt/local/lib
-           /opt/csw/lib
-           /opt/lib
-           )
-       ENDIF(TEMP_SDLSOUND_FIND_MODPLUG_FRAMEWORK)
-       # Clear the temp variable so nobody can see it
-       SET(TEMP_SDLSOUND_FIND_MODPLUG_FRAMEWORK "" CACHE INTERNAL "")
+       FIND_LIBRARY(MODPLUG_LIBRARY
+         NAMES modplug
+         PATHS
+         $ENV{MODPLUGDIR}/lib
+         $ENV{MODPLUGDIR}
+         $ENV{SDLSOUNDDIR}/lib
+         $ENV{SDLSOUNDDIR}
+         $ENV{SDLDIR}/lib
+         $ENV{SDLDIR}
+         /usr/local/lib
+         /usr/lib
+         /sw/lib
+         /opt/local/lib
+         /opt/csw/lib
+       /opt/lib
+       )
        IF(MODPLUG_LIBRARY)
          SET(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${MODPLUG_LIBRARY})
        ENDIF(MODPLUG_LIBRARY)
@@ -302,94 +252,47 @@ IF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
      
      # Find Ogg and Vorbis
      IF("${MY_OUTPUT}" MATCHES "ov_")
-       FIND_FILE(TEMP_SDLSOUND_FIND_VORBIS_FRAMEWORK
-         Vorbis
-         ~/Library/Frameworks/Vorbis.framework
-         /Library/Frameworks/Vorbis.framework
+       FIND_LIBRARY(VORBIS_LIBRARY
+         NAMES vorbis Vorbis VORBIS
+         PATHS
+         $ENV{VORBISDIR}/lib
+         $ENV{VORBISDIR}
+         $ENV{OGGDIR}/lib
+         $ENV{OGGDIR}
+         $ENV{SDLSOUNDDIR}/lib
+         $ENV{SDLSOUNDDIR}
+         $ENV{SDLDIR}/lib
+         $ENV{SDLDIR}
+         /usr/local/lib
+         /usr/lib
+         /sw/lib
+         /opt/local/lib
+         /opt/csw/lib
+       /opt/lib
          )
-       IF(TEMP_SDLSOUND_FIND_VORBIS_FRAMEWORK)
-         # Extract the path the framework resides in so we can use it for the -F flag
-         STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" TEMP_SDLSOUND_VORBIS_FRAMEWORK_PATH_TMP ${TEMP_SDLSOUND_FIND_VORBIS_FRAMEWORK})
-         IF("${TEMP_SDLSOUND_VORBIS_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-             OR "${TEMP_SDLSOUND_VORBIS_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-             )
-           # It's in the default search path so I don't need to use -F
-           SET(VORBIS_LIBRARY "-framework Vorbis" CACHE STRING "Vorbis framework for OSX")
-         ELSE("${TEMP_SDLSOUND_VORBIS_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-             OR "${TEMP_SDLSOUND_VORBIS_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-             )
-           # It's not in the default search path so I need to use -F
-           SET(VORBIS_LIBRARY "-F${TEMP_SDLSOUND_VORBIS_FRAMEWORK_PATH_TMP} -framework Vorbis" CACHE STRING "Vorbis framework for OSX")
-         ENDIF("${TEMP_SDLSOUND_VORBIS_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-           OR "${TEMP_SDLSOUND_VORBIS_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-           )
-         # Clear the temp variable so nobody can see it
-         SET(TEMP_SDLSOUND_VORBIS_FRAMEWORK_PATH_TMP "" CACHE INTERNAL "")
-
-       ELSE(TEMP_SDLSOUND_FIND_VORBIS_FRAMEWORK)
-         FIND_LIBRARY(VORBIS_LIBRARY
-           NAMES vorbis Vorbis VORBIS
-           PATHS
-           $ENV{VORBISDIR}/lib
-           $ENV{OGGDIR}/lib
-           $ENV{SDLSOUNDDIR}/lib
-           $ENV{SDLDIR}/lib
-           /usr/local/lib
-           /usr/lib
-           /sw/lib
-           /opt/local/lib
-           /opt/csw/lib
-           /opt/lib
-           )
-       ENDIF(TEMP_SDLSOUND_FIND_VORBIS_FRAMEWORK)
-       # Clear the temp variable so nobody can see it
        SET(TEMP_SDLSOUND_FIND_VORBIS_FRAMEWORK "" CACHE INTERNAL "")
        IF(VORBIS_LIBRARY)
          SET(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${VORBIS_LIBRARY})
        ENDIF(VORBIS_LIBRARY)
        
-       FIND_FILE(TEMP_SDLSOUND_FIND_OGG_FRAMEWORK 
-         Ogg
-         ~/Library/Frameworks/Ogg.framework
-         /Library/Frameworks/Ogg.framework
+       FIND_LIBRARY(OGG_LIBRARY
+         NAMES ogg Ogg OGG
+         PATHS
+         $ENV{OGGDIR}/lib
+         $ENV{OGGDIR}
+         $ENV{VORBISDIR}/lib
+         $ENV{VORBISDIR}
+         $ENV{SDLSOUNDDIR}/lib
+         $ENV{SDLSOUNDDIR}
+         $ENV{SDLDIR}/lib
+         $ENV{SDLDIR}
+         /usr/local/lib
+         /usr/lib
+         /sw/lib
+         /opt/local/lib
+         /opt/csw/lib
+       /opt/lib
          )
-       IF(TEMP_SDLSOUND_FIND_OGG_FRAMEWORK)
-         # Extract the path the framework resides in so we can use it for the -F flag
-         STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP ${TEMP_SDLSOUND_FIND_OGG_FRAMEWORK})
-         IF("${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-             OR "${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-             )
-           # It's in the default search path so I don't need to use -F
-           SET(OGG_LIBRARY "-framework Ogg" CACHE STRING "Ogg framework for OSX")
-         ELSE("${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-             OR "${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-             )
-           # It's not in the default search path so I need to use -F
-           SET(OGG_LIBRARY "-F${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP} -framework Ogg" CACHE STRING "Ogg framework for OSX")
-         ENDIF("${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-           OR "${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-           )
-         # Clear the temp variable so nobody can see it
-         SET(TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP "" CACHE INTERNAL "")
-
-       ELSE(TEMP_SDLSOUND_FIND_OGG_FRAMEWORK)
-         FIND_LIBRARY(OGG_LIBRARY
-           NAMES ogg Ogg OGG
-           PATHS
-           $ENV{OGGDIR}/lib
-           $ENV{VORBISDIR}/lib
-           $ENV{SDLSOUNDDIR}/lib
-           $ENV{SDLDIR}/lib
-           /usr/local/lib
-           /usr/lib
-           /sw/lib
-           /opt/local/lib
-           /opt/csw/lib
-           /opt/lib
-           )
-       ENDIF(TEMP_SDLSOUND_FIND_OGG_FRAMEWORK)
-       # Clear the temp variable so nobody can see it
-       SET(TEMP_SDLSOUND_FIND_OGG_FRAMEWORK "" CACHE INTERNAL "")
        IF(OGG_LIBRARY)
          SET(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${OGG_LIBRARY})
        ENDIF(OGG_LIBRARY)
@@ -398,47 +301,22 @@ IF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
      
      # Find SMPEG
      IF("${MY_OUTPUT}" MATCHES "SMPEG_")
-       FIND_FILE(TEMP_SDLSOUND_FIND_SMPEG_FRAMEWORK 
-         SMPEG
-         ~/Library/Frameworks/smpeg.framework
-         /Library/Frameworks/smpeg.framework
+       FIND_LIBRARY(SMPEG_LIBRARY
+         NAMES smpeg SMPEG Smpeg SMpeg
+         PATHS
+         $ENV{SMPEGDIR}/lib
+         $ENV{SMPEGDIR}
+         $ENV{SDLSOUNDDIR}/lib
+         $ENV{SDLSOUNDDIR}
+         $ENV{SDLDIR}/lib
+         $ENV{SDLDIR}
+         /usr/local/lib
+         /usr/lib
+         /sw/lib
+         /opt/local/lib
+         /opt/csw/lib
+       /opt/lib
          )
-       IF(TEMP_SDLSOUND_FIND_SMPEG_FRAMEWORK)
-         # Extract the path the framework resides in so we can use it for the -F flag
-         STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" TEMP_SDLSOUND_SMPEG_FRAMEWORK_PATH_TMP ${TEMP_SDLSOUND_FIND_SMPEG_FRAMEWORK})
-         IF("${TEMP_SDLSOUND_SMPEG_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-             OR "${TEMP_SDLSOUND_SMPEG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-             )
-           # It's in the default search path so I don't need to use -F
-           SET(SMPEG_LIBRARY "-framework smpeg" CACHE STRING "SMPEG framework for OSX")
-         ELSE("${TEMP_SDLSOUND_SMPEG_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-             OR "${TEMP_SDLSOUND_SMPEG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-             )
-           # It's not in the default search path so I need to use -F
-           SET(SMPEG_LIBRARY "-F${TEMP_SDLSOUND_SMPEG_FRAMEWORK_PATH_TMP} -framework smpeg" CACHE STRING "SMPEG framework for OSX")
-         ENDIF("${TEMP_SDLSOUND_SMPEG_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-           OR "${TEMP_SDLSOUND_SMPEG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-           )
-         # Clear the temp variable so nobody can see it
-         SET(TEMP_SDLSOUND_SMPEG_FRAMEWORK_PATH_TMP "" CACHE INTERNAL "")
-
-       ELSE(TEMP_SDLSOUND_FIND_SMPEG_FRAMEWORK)
-         FIND_LIBRARY(SMPEG_LIBRARY
-           NAMES smpeg SMPEG Smpeg SMpeg
-           PATHS
-           $ENV{SMPEGDIR}/lib
-           $ENV{SDLSOUNDDIR}/lib
-           $ENV{SDLDIR}/lib
-           /usr/local/lib
-           /usr/lib
-           /sw/lib
-           /opt/local/lib
-           /opt/csw/lib
-           /opt/lib
-           )
-       ENDIF(TEMP_SDLSOUND_FIND_SMPEG_FRAMEWORK)
-       # Clear the temp variable so nobody can see it
-       SET(TEMP_SDLSOUND_FIND_SMPEG_FRAMEWORK "" CACHE INTERNAL "")
        IF(SMPEG_LIBRARY)
          SET(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${SMPEG_LIBRARY})
        ENDIF(SMPEG_LIBRARY)
@@ -447,47 +325,22 @@ IF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
      
      # Find FLAC
      IF("${MY_OUTPUT}" MATCHES "FLAC_")
-       FIND_FILE(TEMP_SDLSOUND_FIND_FLAC_FRAMEWORK 
-         FLAC
-         ~/Library/Frameworks/FLAC.framework
-         /Library/Frameworks/FLAC.framework
+       FIND_LIBRARY(FLAC_LIBRARY
+         NAMES flac FLAC
+         PATHS
+         $ENV{FLACDIR}/lib
+         $ENV{FLACDIR}
+         $ENV{SDLSOUNDDIR}/lib
+         $ENV{SDLSOUNDDIR}
+         $ENV{SDLDIR}/lib
+         $ENV{SDLDIR}
+         /usr/local/lib
+         /usr/lib
+         /sw/lib
+         /opt/local/lib
+         /opt/csw/lib
+       /opt/lib
          )
-       IF(TEMP_SDLSOUND_FIND_FLAC_FRAMEWORK)
-         # Extract the path the framework resides in so we can use it for the -F flag
-         STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" TEMP_SDLSOUND_FLAC_FRAMEWORK_PATH_TMP ${TEMP_SDLSOUND_FIND_FLAC_FRAMEWORK})
-         IF("${TEMP_SDLSOUND_FLAC_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-             OR "${TEMP_SDLSOUND_FLAC_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-             )
-           # It's in the default search path so I don't need to use -F
-           SET(FLAC_LIBRARY "-framework FLAC" CACHE STRING "FLAC framework for OSX")
-         ELSE("${TEMP_SDLSOUND_FLAC_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-             OR "${TEMP_SDLSOUND_FLAC_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-             )
-           # It's not in the default search path so I need to use -F
-           SET(FLAC_LIBRARY "-F${TEMP_SDLSOUND_FLAC_FRAMEWORK_PATH_TMP} -framework FLAC" CACHE STRING "FLAC framework for OSX")
-         ENDIF("${TEMP_SDLSOUND_FLAC_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-           OR "${TEMP_SDLSOUND_FLAC_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-           )
-         # Clear the temp variable so nobody can see it
-         SET(TEMP_SDLSOUND_FLAC_FRAMEWORK_PATH_TMP "" CACHE INTERNAL "")
-
-       ELSE(TEMP_SDLSOUND_FIND_FLAC_FRAMEWORK)
-         FIND_LIBRARY(FLAC_LIBRARY
-           NAMES flac FLAC
-           PATHS
-           $ENV{FLACDIR}/lib
-           $ENV{SDLSOUNDDIR}/lib
-           $ENV{SDLDIR}/lib
-           /usr/local/lib
-           /usr/lib
-           /sw/lib
-           /opt/local/lib
-           /opt/csw/lib
-           /opt/lib
-           )
-       ENDIF(TEMP_SDLSOUND_FIND_FLAC_FRAMEWORK)
-       # Clear the temp variable so nobody can see it
-       SET(TEMP_SDLSOUND_FIND_FLAC_FRAMEWORK "" CACHE INTERNAL "")
        IF(FLAC_LIBRARY)
          SET(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${FLAC_LIBRARY})
        ENDIF(FLAC_LIBRARY)
@@ -499,100 +352,55 @@ IF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
      # in the Ogg symbols. I'm not sure if I should duplicate the ogg stuff
      # above for here or if two ogg entries will screw up things.
      IF("${MY_OUTPUT}" MATCHES "speex_")
-       FIND_FILE(TEMP_SDLSOUND_FIND_SPEEX_FRAMEWORK 
-         speex
-         ~/Library/Frameworks/speex.framework
-         /Library/Frameworks/speex.framework
+       FIND_LIBRARY(SPEEX_LIBRARY
+         NAMES speex SPEEX
+         PATHS
+         $ENV{SPEEXDIR}/lib
+         $ENV{SPEEXDIR}
+         $ENV{SDLSOUNDDIR}/lib
+         $ENV{SDLSOUNDDIR}
+         $ENV{SDLDIR}/lib
+         $ENV{SDLDIR}
+         /usr/local/lib
+         /usr/lib
+         /sw/lib
+         /opt/local/lib
+         /opt/csw/lib
+       /opt/lib
          )
-       IF(TEMP_SDLSOUND_FIND_SPEEX_FRAMEWORK)
-         # Extract the path the framework resides in so we can use it for the -F flag
-         STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" TEMP_SDLSOUND_SPEEX_FRAMEWORK_PATH_TMP ${TEMP_SDLSOUND_FIND_SPEEX_FRAMEWORK})
-         IF("${TEMP_SDLSOUND_SPEEX_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-             OR "${TEMP_SDLSOUND_SPEEX_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-             )
-           # It's in the default search path so I don't need to use -F
-           SET(SPEEX_LIBRARY "-framework speex" CACHE STRING "SPEEX framework for OSX")
-         ELSE("${TEMP_SDLSOUND_SPEEX_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-             OR "${TEMP_SDLSOUND_SPEEX_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-             )
-           # It's not in the default search path so I need to use -F
-           SET(SPEEX_LIBRARY "-F${TEMP_SDLSOUND_SPEEX_FRAMEWORK_PATH_TMP} -framework speex" CACHE STRING "SPEEX framework for OSX")
-         ENDIF("${TEMP_SDLSOUND_SPEEX_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-           OR "${TEMP_SDLSOUND_SPEEX_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-           )
-         # Clear the temp variable so nobody can see it
-         SET(TEMP_SDLSOUND_SPEEX_FRAMEWORK_PATH_TMP "" CACHE INTERNAL "")
-
-       ELSE(TEMP_SDLSOUND_FIND_SPEEX_FRAMEWORK)
-         FIND_LIBRARY(SPEEX_LIBRARY
-           NAMES speex SPEEX
-           PATHS
-           $ENV{SPEEXDIR}/lib
-           $ENV{SDLSOUNDDIR}/lib
-           $ENV{SDLDIR}/lib
-           /usr/local/lib
-           /usr/lib
-           /sw/lib
-           /opt/local/lib
-           /opt/csw/lib
-           /opt/lib
-           )
-       ENDIF(TEMP_SDLSOUND_FIND_SPEEX_FRAMEWORK)
-       # Clear the temp variable so nobody can see it
-       SET(TEMP_SDLSOUND_FIND_SPEEX_FRAMEWORK "" CACHE INTERNAL "")
-       SET(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${SPEEX_LIBRARY})
+       IF(SPEEX_LIBRARY)
+         SET(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${SPEEX_LIBRARY})
+       ENDIF(SPEEX_LIBRARY)
        
        # Find OGG (needed for Speex)
-       FIND_FILE(TEMP_SDLSOUND_FIND_OGG_FRAMEWORK 
-         Ogg
-         ~/Library/Frameworks/Ogg.framework
-         /Library/Frameworks/Ogg.framework
-         )
-       IF(TEMP_SDLSOUND_FIND_OGG_FRAMEWORK)
-         # Extract the path the framework resides in so we can use it for the -F flag
-         STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP ${TEMP_SDLSOUND_FIND_OGG_FRAMEWORK})
-         IF("${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-             OR "${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-             )
-           # It's in the default search path so I don't need to use -F
-           SET(OGG_LIBRARY "-framework Ogg" CACHE STRING "Ogg framework for OSX")
-         ELSE("${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-             OR "${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-             )
-           # It's not in the default search path so I need to use -F
-           SET(OGG_LIBRARY "-F${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP} -framework Ogg" CACHE STRING "Ogg framework for OSX")
-         ENDIF("${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-           OR "${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-           )
-         # Clear the temp variable so nobody can see it
-         SET(TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP "" CACHE INTERNAL "")
-         
-       ELSE(TEMP_SDLSOUND_FIND_OGG_FRAMEWORK)
+     # We might have already found Ogg for Vorbis, so skip it if so.
+       IF(NOT OGG_LIBRARY)
          FIND_LIBRARY(OGG_LIBRARY
            NAMES ogg Ogg OGG
            PATHS
            $ENV{OGGDIR}/lib
+           $ENV{OGGDIR}
            $ENV{VORBISDIR}/lib
+           $ENV{VORBISDIR}
            $ENV{SPEEXDIR}/lib
+           $ENV{SPEEXDIR}
            $ENV{SDLSOUNDDIR}/lib
+           $ENV{SDLSOUNDDIR}
            $ENV{SDLDIR}/lib
+           $ENV{SDLDIR}
            /usr/local/lib
            /usr/lib
            /sw/lib
            /opt/local/lib
            /opt/csw/lib
-           /opt/lib
+         /opt/lib
            )
-       ENDIF(TEMP_SDLSOUND_FIND_OGG_FRAMEWORK)
-       # Clear the temp variable so nobody can see it
-       SET(TEMP_SDLSOUND_FIND_OGG_FRAMEWORK "" CACHE INTERNAL "")
-       IF(OGG_LIBRARY)
-         SET(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${OGG_LIBRARY})
-       ENDIF(OGG_LIBRARY)
+         IF(OGG_LIBRARY)
+           SET(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${OGG_LIBRARY})
+         ENDIF(OGG_LIBRARY)
+       ENDIF(NOT OGG_LIBRARY)
      ENDIF("${MY_OUTPUT}" MATCHES "speex_")
      
-     
-     
    ELSE(NOT MY_RESULT)
      SET(SDL_SOUND_LIBRARIES "${SDL_SOUND_EXTRAS} ${SDL_SOUND_LIBRARY}" CACHE INTERNAL "SDL_sound and dependent libraries")
    ENDIF(NOT MY_RESULT)