diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-25 10:37:59 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-25 10:37:59 +0100 |
| commit | b9f5ced5bb2c38bda9b8bdf53a329a040029bee4 (patch) | |
| tree | 6d783d9937048b0528a51001489891f8ab9319a2 | |
| parent | e2c6e1784eb1447dd78267ff19eff06a487f40e8 (diff) | |
VWR-23181 (port of SNOW-650) 'Tries to build pulseaudio when pulseaudio not found.'
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/media_plugins/webkit/CMakeLists.txt | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 3da5af687e..bda461b0d6 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -651,6 +651,7 @@ Teardrops Fall Techwolf Lupindo SNOW-92 SNOW-649 + SNOW-650 SNOW-687 SNOW-680 SNOW-681 diff --git a/indra/media_plugins/webkit/CMakeLists.txt b/indra/media_plugins/webkit/CMakeLists.txt index d576638dd7..619b4baeef 100644 --- a/indra/media_plugins/webkit/CMakeLists.txt +++ b/indra/media_plugins/webkit/CMakeLists.txt @@ -51,9 +51,9 @@ set(media_plugin_webkit_LINK_LIBRARIES # Select which VolumeCatcher implementation to use if (LINUX) - if (PULSEAUDIO) + if (PULSEAUDIO_FOUND) list(APPEND media_plugin_webkit_SOURCE_FILES linux_volume_catcher.cpp) - endif (PULSEAUDIO) + endif (PULSEAUDIO_FOUND) list(APPEND media_plugin_webkit_LINK_LIBRARIES ${UI_LIBRARIES} # for glib/GTK ) |