From 51081c09ae8d186c1ca5e61d19a73e01b8120c8a Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Wed, 11 Mar 2009 20:41:00 -0500
Subject: Removed redundant/unnecessary OpenAL lib names and paths

---
 ChangeLog.txt                   |  3 +++
 linden/indra/cmake/OPENAL.cmake | 10 +++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index e8023c5..ed894cc 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,8 @@
 2009-03-11  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
+	* linden/indra/cmake/OPENAL.cmake:
+	Removed redundant/unnecessary OpenAL lib names and paths.
+
 	* linden/indra/newview/viewer_manifest.py:
 	Added Mac gstreamer plugins to viewer manifest.
 
diff --git a/linden/indra/cmake/OPENAL.cmake b/linden/indra/cmake/OPENAL.cmake
index a5e966f..2ebee01 100644
--- a/linden/indra/cmake/OPENAL.cmake
+++ b/linden/indra/cmake/OPENAL.cmake
@@ -11,12 +11,12 @@ if (OPENAL)
 
   if (WINDOWS)
     find_library(OPENAL_LIB
-      NAMES openal openal32 OpenAL OpenAL32 wrap_oal
+      NAMES openal32
       PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release
       )
   else (WINDOWS)
    find_library(OPENAL_LIB
-     NAMES openal openal32 OpenAL OpenAL32 wrap_oal
+     NAMES openal
      PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
      )
   endif (WINDOWS)
@@ -33,7 +33,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)
@@ -53,7 +53,7 @@ if (OPENAL)
      )
   else (WINDOWS) 
     find_library(ALUT_LIB
-      NAMES alut freealut
+      NAMES alut
       PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
       )
   endif (WINDOWS)
@@ -70,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)
-- 
cgit v1.1