From 640cd96159d0d3329a926954cffc4d8b09a06002 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Mon, 20 Apr 2009 22:29:46 -0500
Subject: Help (force) Mac to use the right OpenAL lib and header dir.

---
 ChangeLog.txt                   |  4 ++++
 linden/indra/cmake/OPENAL.cmake | 15 ++++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 2974b10..0c90898 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,9 @@
 2009-04-20  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
+	* linden/indra/cmake/OPENAL.cmake:
+	Help (force) Mac find the right OpenAL lib and header dir.
+
+
 	* linden/install.xml:
 	Mac viewer uses Thomas Shikami's OpenAL libs.
 
diff --git a/linden/indra/cmake/OPENAL.cmake b/linden/indra/cmake/OPENAL.cmake
index 908021c..94fa75d 100644
--- a/linden/indra/cmake/OPENAL.cmake
+++ b/linden/indra/cmake/OPENAL.cmake
@@ -20,8 +20,9 @@ if (OPENAL)
   elseif (DARWIN)
     # Look for for system's OpenAL.framework
     find_library(OPENAL_LIB
-      NAMES OpenAL openal
+      NAMES openal.1
       PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
+      NO_DEFAULT_PATH
       )
   else (WINDOWS)
     set(OPENAL_LIB openal)
@@ -37,10 +38,14 @@ if (OPENAL)
 
   # OPENAL_INCLUDE_DIR
 
-  find_path(OPENAL_INCLUDE_DIR
-    NAMES al.h
-    PATHS ${LIBS_PREBUILT_DIR}/include/AL
-    )
+  if (DARWIN)
+    set(OPENAL_INCLUDE_DIR "${LIBS_PREBUILT_DIR}/include/AL")        
+  else (DARWIN)
+    find_path(OPENAL_INCLUDE_DIR
+      NAMES al.h
+      PATHS ${LIBS_PREBUILT_DIR}/include/AL
+      )
+  endif (DARWIN)
 
   if (NOT OPENAL_INCLUDE_DIR)
     message(FATAL_ERROR "al.h not found!")
-- 
cgit v1.1