2 files changed, 33 insertions, 7 deletions

diff --git a/linden/indra/cmake/GStreamer.cmake b/linden/indra/cmake/GStreamer.cmake
index c1bbc57..880233e 100644
--- a/linden/indra/cmake/GStreamer.cmake
+++ b/linden/indra/cmake/GStreamer.cmake
@@ -64,6 +64,18 @@ else (WINDOWS)
 
   if (DARWIN)
 
+    find_library( XML2_LIB
+      NAMES xml2.2
+      PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
+      NO_DEFAULT_PATH
+      DOC "libxml2 dynamic library / shared object" )
+
+    if (NOT XML2_LIB)
+      message(FATAL_ERROR "libxml2 not found!")
+    else (NOT XML2_LIB)
+      #message(STATUS "libxml2 found: ${XML2_LIB}")
+    endif (NOT XML2_LIB)
+
     set(GSTREAMER_LIBRARIES
         gstvideo-0.10
         gstaudio-0.10
@@ -73,7 +85,7 @@ else (WINDOWS)
         gmodule-2.0
         gthread-2.0
         glib-2.0
-        xml2
+        ${XML2_LIB}
         )
 
   else (DARWIN)
diff --git a/linden/indra/cmake/OPENAL.cmake b/linden/indra/cmake/OPENAL.cmake
index f06a38e..94fa75d 100644
--- a/linden/indra/cmake/OPENAL.cmake
+++ b/linden/indra/cmake/OPENAL.cmake
@@ -1,5 +1,8 @@
 # -*- cmake -*-
 
+include(Variables)
+include(Linking)
+
 set(OPENAL ON CACHE BOOL "Enable OpenAL")
 
 
@@ -17,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)
@@ -34,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!")
@@ -54,7 +62,13 @@ if (OPENAL)
      NAMES alut freealut
      PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release
      )
-  else (WINDOWS) 
+  elseif (DARWIN)
+    find_library( ALUT_LIB
+      NAMES alut.0
+      PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
+      NO_DEFAULT_PATH
+      )
+  else (WINDOWS)
     set(ALUT_LIB alut)
   endif (WINDOWS)