1 files changed, 17 insertions, 19 deletions

diff --git a/linden/indra/cmake/OPENAL.cmake b/linden/indra/cmake/OPENAL.cmake
index 5e71f66..f06a38e 100644
--- a/linden/indra/cmake/OPENAL.cmake
+++ b/linden/indra/cmake/OPENAL.cmake
@@ -10,16 +10,18 @@ if (OPENAL)
   # OPENAL_LIB
 
   if (WINDOWS)
-  find_library(OPENAL_LIB
-    NAMES openal openal32 OpenAL OpenAL32 wrap_oal
-    PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release
-    )
-
+    find_library(OPENAL_LIB
+      NAMES openal32
+      PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release
+      )
+  elseif (DARWIN)
+    # Look for for system's OpenAL.framework
+    find_library(OPENAL_LIB
+      NAMES OpenAL openal
+      PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
+      )
   else (WINDOWS)
-  find_library(OPENAL_LIB
-    NAMES openal openal32 OpenAL OpenAL32 wrap_oal
-    PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
-    )
+    set(OPENAL_LIB openal)
   endif (WINDOWS)
   
   if (NOT OPENAL_LIB)
@@ -34,7 +36,7 @@ if (OPENAL)
 
   find_path(OPENAL_INCLUDE_DIR
     NAMES al.h
-    PATHS ${LIBS_PREBUILT_DIR}/include/AL /usr/include/AL
+    PATHS ${LIBS_PREBUILT_DIR}/include/AL
     )
 
   if (NOT OPENAL_INCLUDE_DIR)
@@ -49,15 +51,11 @@ if (OPENAL)
 
   if (WINDOWS)
    find_library(ALUT_LIB
-   NAMES alut freealut
-   PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release
-   )
-  
+     NAMES alut freealut
+     PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release
+     )
   else (WINDOWS) 
-  find_library(ALUT_LIB
-    NAMES alut freealut
-    PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
-    )
+    set(ALUT_LIB alut)
   endif (WINDOWS)
 
   if (NOT ALUT_LIB)
@@ -72,7 +70,7 @@ if (OPENAL)
 
   find_path(ALUT_INCLUDE_DIR
     NAMES alut.h
-    PATHS ${LIBS_PREBUILT_DIR}/include/AL /usr/include/AL
+    PATHS ${LIBS_PREBUILT_DIR}/include/AL
     )
 
   if (NOT ALUT_INCLUDE_DIR)