From d3e601b407d0e439bf810e16de1e4ffd40001aaa Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 17 Oct 2008 22:10:52 -0500
Subject: Disable fmod by default.

You can give -DFMOD=ON at configure time to turn it on.
---
 ChangeLog.txt                 | 4 ++++
 linden/indra/cmake/FMOD.cmake | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 21414d2..7103009 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,9 @@
 2008-10-17  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
+	* linden/indra/cmake/FMOD.cmake: 
+	Disable fmod by default.
+	You can give -DFMOD=ON at configure time to turn it on.
+
 	* linden/indra/newview/CMakeLists.txt: 
 	Use FMOD_LIBRARY variable. It's there for a reason.
 	
diff --git a/linden/indra/cmake/FMOD.cmake b/linden/indra/cmake/FMOD.cmake
index 759b8f1..e9f483a 100644
--- a/linden/indra/cmake/FMOD.cmake
+++ b/linden/indra/cmake/FMOD.cmake
@@ -7,6 +7,7 @@ if(INSTALL_PROPRIETARY)
   use_prebuilt_binary(fmod)
 endif(INSTALL_PROPRIETARY)
 
+if (FMOD)
 find_library(FMOD_LIBRARY_RELEASE
              NAMES fmod fmodvc fmod-3.75
              PATHS
@@ -18,6 +19,7 @@ find_library(FMOD_LIBRARY_DEBUG
              PATHS
              ${ARCH_PREBUILT_DIRS_DEBUG}
              )
+endif (FMOD)
 
 if (FMOD_LIBRARY_RELEASE AND FMOD_LIBRARY_DEBUG)
   set(FMOD_LIBRARY
-- 
cgit v1.1