From 4932af1c6806c351aa687433c10ba57d2a502c59 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Thu, 12 Mar 2009 09:16:53 -0500
Subject: Don't find specific OpenAL lib locations on Mac/Linux.

Linking that way is bad. Just use -lopenal -lalut instead.
---
 ChangeLog.txt                   |  7 +++++++
 linden/indra/cmake/OPENAL.cmake | 10 ++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index ed894cc..dc7712b 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,10 @@
+2009-03-12  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+	* linden/indra/cmake/OPENAL.cmake:
+	Don't find specific OpenAL lib locations on Mac/Linux.
+	Linking that way is bad. Just use -lopenal -lalut instead.
+
+
 2009-03-11  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
 	* linden/indra/cmake/OPENAL.cmake:
diff --git a/linden/indra/cmake/OPENAL.cmake b/linden/indra/cmake/OPENAL.cmake
index 2ebee01..11dcdc7 100644
--- a/linden/indra/cmake/OPENAL.cmake
+++ b/linden/indra/cmake/OPENAL.cmake
@@ -15,10 +15,7 @@ if (OPENAL)
       PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release
       )
   else (WINDOWS)
-   find_library(OPENAL_LIB
-     NAMES openal
-     PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
-     )
+    set(OPENAL_LIB openal)    
   endif (WINDOWS)
   
   if (NOT OPENAL_LIB)
@@ -52,10 +49,7 @@ if (OPENAL)
      PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release
      )
   else (WINDOWS) 
-    find_library(ALUT_LIB
-      NAMES alut
-      PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
-      )
+    set(ALUT_LIB alut)
   endif (WINDOWS)
 
   if (NOT ALUT_LIB)
-- 
cgit v1.1