From fa9811e0c5dbd249a9c6e37d95d2d842d43658a2 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Mon, 22 Feb 2010 16:09:25 +0000
Subject: Fix Mac build with the renamed boost libs

---
 indra/cmake/Boost.cmake | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/cmake')

diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
index 3652508b6a..7ce57a5572 100644
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -38,9 +38,9 @@ else (STANDALONE)
           debug libboost_signals-vc80-mt-gd-${BOOST_VERSION})
     endif (MSVC71)
   elseif (DARWIN)
-    set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
-    set(BOOST_REGEX_LIBRARY boost_regex-mt)
-    set(BOOST_SIGNALS_LIBRARY boost_signals-mt)
+    set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-xgcc40-mt)
+    set(BOOST_REGEX_LIBRARY boost_regex-xgcc40-mt)
+    set(BOOST_SIGNALS_LIBRARY boost_signals-xgcc40-mt)
   elseif (LINUX)
     set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-gcc41-mt)
     set(BOOST_REGEX_LIBRARY boost_regex-gcc41-mt)
-- 
cgit v1.2.3


From f43a9a181ee0233adaed03a93190dc518ff0047f Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Mon, 22 Feb 2010 16:50:26 +0000
Subject: Do the necessary stuff to package pulseaudio's headers and make it
 (in theory, not yet in practice) optional.

---
 indra/cmake/PulseAudio.cmake | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 indra/cmake/PulseAudio.cmake

(limited to 'indra/cmake')

diff --git a/indra/cmake/PulseAudio.cmake b/indra/cmake/PulseAudio.cmake
new file mode 100644
index 0000000000..f8087a8083
--- /dev/null
+++ b/indra/cmake/PulseAudio.cmake
@@ -0,0 +1,28 @@
+# -*- cmake -*-
+include(Prebuilt)
+
+if (STANDALONE)
+  include(FindPkgConfig)
+
+  pkg_check_modules(PULSEAUDIO REQUIRED libpulse-mainloop-glib)
+
+elseif (LINUX)
+  use_prebuilt_binary(pulseaudio)
+  set(PULSEAUDIO_FOUND ON FORCE BOOL)
+  set(PULSEAUDIO_INCLUDE_DIRS
+      ${LIBS_PREBUILT_DIR}/include
+      )
+  # We don't need to explicitly link against pulseaudio itself, because
+  # the viewer probes for the system's copy at runtime.
+  set(PULSEAUDIO_LIBRARIES
+    # none needed!
+    )
+endif (STANDALONE)
+
+if (PULSEAUDIO_FOUND)
+  set(PULSEAUDIO ON CACHE BOOL "Build with PulseAudio support, if available.")
+endif (PULSEAUDIO_FOUND)
+
+if (PULSEAUDIO)
+  add_definitions(-DLL_PULSEAUDIO_ENABLED=1)
+endif (PULSEAUDIO)
-- 
cgit v1.2.3