From ae2644535b37a3ff65a64145a091cdb443206a29 Mon Sep 17 00:00:00 2001
From: Nicky <nicky.dasmijn@gmail.com>
Date: Tue, 8 Feb 2022 09:55:35 +0100
Subject: [PATCH] Linux; Do not build with OpenAL unless really requested.

---
 indra/cmake/GLIB.cmake         | 2 +-
 indra/cmake/OPENAL.cmake       | 3 ++-
 scripts/configure_firestorm.sh | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/indra/cmake/GLIB.cmake b/indra/cmake/GLIB.cmake
index ce0ac3e76f..186195e078 100644
--- a/indra/cmake/GLIB.cmake
+++ b/indra/cmake/GLIB.cmake
@@ -6,6 +6,6 @@ if( LINUX )
   set(GLIB_FOUND ON CACHE BOOL "Build against glib 2")
   set(GLIB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/glib-2.0 ${LIBS_PREBUILT_DIR}/lib/release/glib-2.0/include ) 
   set(GLIB_LIBRARIES libgobject-2.0.a libglib-2.0.a libffi.a libpcre.a)
-  set(GIO_LIBRARIES libgio-2.0.a libgmodule-2.0.a -lresolv)
+  set(GIO_LIBRARIES libgio-2.0.a libgmodule-2.0.a -lresolv ${GLIB_LIBRARIES} )
   add_definitions(-DLL_GLIB=1)
 endif()
diff --git a/indra/cmake/OPENAL.cmake b/indra/cmake/OPENAL.cmake
index 1bbfff6f98..0fa33a8637 100644
--- a/indra/cmake/OPENAL.cmake
+++ b/indra/cmake/OPENAL.cmake
@@ -3,7 +3,8 @@ include(Linking)
 include(Prebuilt)
 
 if (LINUX)
-  set(OPENAL ON CACHE BOOL "Enable OpenAL")
+  use_prebuilt_binary(openal) #Always need the .so for voice
+  set(OPENAL OFF CACHE BOOL "Enable OpenAL")
 else (LINUX)
   set(OPENAL OFF CACHE BOOL "Enable OpenAL")
 endif (LINUX)
diff --git a/scripts/configure_firestorm.sh b/scripts/configure_firestorm.sh
index e6615fbb3d..fb06b8c0e1 100755
--- a/scripts/configure_firestorm.sh
+++ b/scripts/configure_firestorm.sh
@@ -528,7 +528,6 @@ if [ $WANTS_CONFIG -eq $TRUE ] ; then
     if [ $TARGET_PLATFORM == "darwin" ] ; then
         TARGET="Xcode"
     elif [ \( $TARGET_PLATFORM == "linux" \) ] ; then
-        OPENAL="-DOPENAL:BOOL=ON"
         TARGET="Unix Makefiles"
         if [ $WANTS_VSCODE -eq $TRUE ] ; then
             VSCODE_FLAGS="-DCMAKE_EXPORT_COMPILE_COMMANDS=On"