diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 87484f4ae3628c2957555b9da678944af0284592..69173c38a20ea5be7d7cc08d44e248518a743576 100755
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -173,12 +173,12 @@ if (LINUX)
   endif (WORD_SIZE EQUAL 32)
   add_definitions(-mfpmath=sse)
   #add_definitions(-ftree-vectorize) # THIS CRASHES GCC 3.1-3.2
-  if (NOT STANDALONE)
+  if (NOT USESYSTEMLIBS)
     # this stops us requiring a really recent glibc at runtime
     add_definitions(-fno-stack-protector)
     # linking can be very memory-hungry, especially the final viewer link
     set(CMAKE_CXX_LINK_FLAGS "-Wl,--no-keep-memory")
-  endif (NOT STANDALONE)
+  endif (NOT USESYSTEMLIBS)
 
   set(CMAKE_CXX_FLAGS_DEBUG "-fno-inline ${CMAKE_CXX_FLAGS_DEBUG}")
   set(CMAKE_CXX_FLAGS_RELEASE "-O2 ${CMAKE_CXX_FLAGS_RELEASE}")
@@ -225,14 +225,14 @@ if (LINUX OR DARWIN)
 endif (LINUX OR DARWIN)
 
 
-if (STANDALONE)
+if (USESYSTEMLIBS)
   add_definitions(-DLL_STANDALONE=1)
 
   if (LINUX AND ${ARCH} STREQUAL "i686")
     add_definitions(-march=pentiumpro)
   endif (LINUX AND ${ARCH} STREQUAL "i686")
 
-else (STANDALONE)
+else (USESYSTEMLIBS)
   set(${ARCH}_linux_INCLUDES
       ELFIO
       atk-1.0
@@ -241,6 +241,6 @@ else (STANDALONE)
       gtk-2.0
       pango-1.0
       )
-endif (STANDALONE)
+endif (USESYSTEMLIBS)
 
 endif(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED)
diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake
index a87027f5f64ba898a5e145d0ccf1cd32699213b9..1a01671002597c492ebe60a4c8640bd17921beac 100755
--- a/indra/cmake/APR.cmake
+++ b/indra/cmake/APR.cmake
@@ -8,9 +8,9 @@ set(APR_FIND_REQUIRED ON)
 set(APRUTIL_FIND_QUIETLY ON)
 set(APRUTIL_FIND_REQUIRED ON)
 
-if (STANDALONE)
+if (USESYSTEMLIBS)
   include(FindAPR)
-else (STANDALONE)
+else (USESYSTEMLIBS)
   use_prebuilt_binary(apr_suite)
   if (WINDOWS)
     if (LLCOMMON_LINK_SHARED)
@@ -52,4 +52,4 @@ else (STANDALONE)
       list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES} uuid)
     list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES} rt)
   endif (LINUX)
-endif (STANDALONE)
+endif (USESYSTEMLIBS)
diff --git a/indra/cmake/Audio.cmake b/indra/cmake/Audio.cmake
index d23bc2f9c6a04763d29f734bab5b3dd7d20909c9..876b7f82a8802f969614d7111b435721be4f039e 100755
--- a/indra/cmake/Audio.cmake
+++ b/indra/cmake/Audio.cmake
@@ -1,13 +1,13 @@
 # -*- cmake -*-
 include(Prebuilt)
 
-if (STANDALONE)
+if (USESYSTEMLIBS)
   include(FindPkgConfig)
   pkg_check_modules(OGG REQUIRED ogg)
   pkg_check_modules(VORBIS REQUIRED vorbis)
   pkg_check_modules(VORBISENC REQUIRED vorbisenc)
   pkg_check_modules(VORBISFILE REQUIRED vorbisfile)
-else (STANDALONE)
+else (USESYSTEMLIBS)
   use_prebuilt_binary(ogg-vorbis)
   set(VORBIS_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
   set(VORBISENC_INCLUDE_DIRS ${VORBIS_INCLUDE_DIRS})
@@ -32,7 +32,7 @@ else (STANDALONE)
     set(VORBISENC_LIBRARIES vorbisenc)
     set(VORBISFILE_LIBRARIES vorbisfile)
   endif (WINDOWS)
-endif (STANDALONE)
+endif (USESYSTEMLIBS)
 
 link_directories(
     ${VORBIS_LIBRARY_DIRS}
diff --git a/indra/cmake/BerkeleyDB.cmake b/indra/cmake/BerkeleyDB.cmake
index 57b53f46ffbadd93e28fc1c468ba95f21d6270b8..5f6b644a15da4ed3465faff71b228b4fb58df3f2 100755
--- a/indra/cmake/BerkeleyDB.cmake
+++ b/indra/cmake/BerkeleyDB.cmake
@@ -3,9 +3,9 @@
 set(DB_FIND_QUIETLY ON)
 set(DB_FIND_REQUIRED ON)
 
-if (STANDALONE)
+if (USESYSTEMLIBS)
   include(FindBerkeleyDB)
-else (STANDALONE)
+else (USESYSTEMLIBS)
   if (LINUX)
     # Need to add dependency pthread explicitely to support ld.gold.
     use_prebuilt_binary(db)
@@ -14,4 +14,4 @@ else (STANDALONE)
     set(DB_LIBRARIES db-4.2)
   endif (LINUX)
   set(DB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
-endif (STANDALONE)
+endif (USESYSTEMLIBS)
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
index cff762e1f024cb447e68d40e4151253b4640a86d..50ac27d402065e0151f548e63ff2c67abbd7758e 100755
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -4,7 +4,7 @@ include(Prebuilt)
 set(Boost_FIND_QUIETLY ON)
 set(Boost_FIND_REQUIRED ON)
 
-if (STANDALONE)
+if (USESYSTEMLIBS)
   include(FindBoost)
 
   set(BOOST_CONTEXT_LIBRARY boost_context-mt)
@@ -14,7 +14,7 @@ if (STANDALONE)
   set(BOOST_SIGNALS_LIBRARY boost_signals-mt)
   set(BOOST_SYSTEM_LIBRARY boost_system-mt)
   set(BOOST_THREAD_LIBRARY boost_thread-mt)
-else (STANDALONE)
+else (USESYSTEMLIBS)
   use_prebuilt_binary(boost)
   set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
   set(BOOST_VERSION "1.52")
@@ -111,4 +111,4 @@ else (STANDALONE)
         optimized boost_thread-mt
         debug boost_thread-mt-d)
   endif (WINDOWS)
-endif (STANDALONE)
+endif (USESYSTEMLIBS)
diff --git a/indra/cmake/CARes.cmake b/indra/cmake/CARes.cmake
index b0dac5b12fb7c8919ae6145ab86de8dd1c862b4d..baa55aa49dca5120c7a1e8c59454630cc42a4683 100755
--- a/indra/cmake/CARes.cmake
+++ b/indra/cmake/CARes.cmake
@@ -5,9 +5,9 @@ include(Prebuilt)
 set(CARES_FIND_QUIETLY ON)
 set(CARES_FIND_REQUIRED ON)
 
-if (STANDALONE)
+if (USESYSTEMLIBS)
   include(FindCARes)
-else (STANDALONE)
+else (USESYSTEMLIBS)
     use_prebuilt_binary(ares)
     add_definitions("-DCARES_STATICLIB")
     if (WINDOWS)
@@ -18,4 +18,4 @@ else (STANDALONE)
         set(CARES_LIBRARIES cares)
     endif (WINDOWS)
     set(CARES_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/ares)
-endif (STANDALONE)
+endif (USESYSTEMLIBS)
diff --git a/indra/cmake/CURL.cmake b/indra/cmake/CURL.cmake
index 9aba08e573df9bc636cdc6cd59f841f12228c72f..04afae594dd58ac3f21302502c628e72c615e190 100755
--- a/indra/cmake/CURL.cmake
+++ b/indra/cmake/CURL.cmake
@@ -4,9 +4,9 @@ include(Prebuilt)
 set(CURL_FIND_QUIETLY ON)
 set(CURL_FIND_REQUIRED ON)
 
-if (STANDALONE)
+if (USESYSTEMLIBS)
   include(FindCURL)
-else (STANDALONE)
+else (USESYSTEMLIBS)
   use_prebuilt_binary(curl)
   if (WINDOWS)
     set(CURL_LIBRARIES 
@@ -16,4 +16,4 @@ else (STANDALONE)
     set(CURL_LIBRARIES libcurl.a)
   endif (WINDOWS)
   set(CURL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
-endif (STANDALONE)
+endif (USESYSTEMLIBS)
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index f98e88b6970960ff253b0da34e17aff09e5a36fe..4f1b6640c2466b6052ebc9e7554bdc3a6e62b688 100755
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -374,9 +374,9 @@ copy_if_different(
     )
 set(third_party_targets ${third_party_targets} ${out_targets})
 
-if(NOT STANDALONE)
+if(NOT USESYSTEMLIBS)
   add_custom_target(
       stage_third_party_libs ALL
       DEPENDS ${third_party_targets}
       )
-endif(NOT STANDALONE)
+endif(NOT USESYSTEMLIBS)
diff --git a/indra/cmake/DBusGlib.cmake b/indra/cmake/DBusGlib.cmake
index 83c08d3350926ce85359a23cce4d33eb45e2d760..d148a35a5b0730f47a8c74ef3d04a70650daf467 100755
--- a/indra/cmake/DBusGlib.cmake
+++ b/indra/cmake/DBusGlib.cmake
@@ -1,7 +1,7 @@
 # -*- cmake -*-
 include(Prebuilt)
 
-if (STANDALONE)
+if (USESYSTEMLIBS)
   include(FindPkgConfig)
 
   pkg_check_modules(DBUSGLIB REQUIRED dbus-glib-1)
@@ -18,7 +18,7 @@ elseif (LINUX)
       gobject-2.0
       glib-2.0
       )
-endif (STANDALONE)
+endif (USESYSTEMLIBS)
 
 if (DBUSGLIB_FOUND)
   set(DBUSGLIB ON CACHE BOOL "Build with dbus-glib message bus support.")
diff --git a/indra/cmake/EXPAT.cmake b/indra/cmake/EXPAT.cmake
index acb15dc623dffce82fddd142467237f67938202f..c1155531ff6d1a4e9b52d3edd3eafba294b499a2 100755
--- a/indra/cmake/EXPAT.cmake
+++ b/indra/cmake/EXPAT.cmake
@@ -4,9 +4,9 @@ include(Prebuilt)
 set(EXPAT_FIND_QUIETLY ON)
 set(EXPAT_FIND_REQUIRED ON)
 
-if (STANDALONE)
+if (USESYSTEMLIBS)
   include(FindEXPAT)
-else (STANDALONE)
+else (USESYSTEMLIBS)
     use_prebuilt_binary(expat)
     if (WINDOWS)
         set(EXPAT_LIBRARIES libexpatMT)
@@ -14,4 +14,4 @@ else (STANDALONE)
         set(EXPAT_LIBRARIES expat)
     endif (WINDOWS)
     set(EXPAT_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
-endif (STANDALONE)
+endif (USESYSTEMLIBS)
diff --git a/indra/cmake/ExamplePlugin.cmake b/indra/cmake/ExamplePlugin.cmake
index 599787ad21a7f7f73834b57dcca55501945a064d..5d826c1f66f5eb8c4b5cf57a93463b8fb456b90d 100755
--- a/indra/cmake/ExamplePlugin.cmake
+++ b/indra/cmake/ExamplePlugin.cmake
@@ -2,13 +2,13 @@
 include(Linking)
 include(Prebuilt)
 
-if (STANDALONE)
+if (USESYSTEMLIBS)
     set(EXAMPLEPLUGIN OFF CACHE BOOL
         "EXAMPLEPLUGIN support for the llplugin/llmedia test apps.")
-else (STANDALONE)
+else (USESYSTEMLIBS)
     set(EXAMPLEPLUGIN ON CACHE BOOL
         "EXAMPLEPLUGIN support for the llplugin/llmedia test apps.")
-endif (STANDALONE)
+endif (USESYSTEMLIBS)
 
 if (WINDOWS)
 elseif (DARWIN)
diff --git a/indra/cmake/FMODEX.cmake b/indra/cmake/FMODEX.cmake
index 163260137bcf4af312ca0486dcddb1c720b34e6e..4981bfb7a621f430d627c6289d336025711f3398 100644
--- a/indra/cmake/FMODEX.cmake
+++ b/indra/cmake/FMODEX.cmake
@@ -4,17 +4,17 @@
 # When building using proprietary binaries though (i.e. having access to LL private servers),
 # we always build with FMODEX.
 # Open source devs should use the -DFMODEX:BOOL=ON then if they want to build with FMOD, whether
-# they are using STANDALONE or not.
+# they are using USESYSTEMLIBS or not.
 if (INSTALL_PROPRIETARY)
   set(FMODEX ON CACHE BOOL "Using FMOD Ex sound library.")
 endif (INSTALL_PROPRIETARY)
 
 if (FMODEX)
-  if (STANDALONE)
+  if (USESYSTEMLIBS)
     # In that case, we use the version of the library installed on the system
     set(FMODEX_FIND_REQUIRED ON)
     include(FindFMODEX)
-  else (STANDALONE)
+  else (USESYSTEMLIBS)
     if (FMODEX_LIBRARY AND FMODEX_INCLUDE_DIR)
       # If the path have been specified in the arguments, use that
       set(FMODEX_LIBRARIES ${FMODEX_LIBRARY})
@@ -41,6 +41,6 @@ if (FMODEX)
       set(FMODEX_LIBRARIES ${FMODEX_LIBRARY})
       set(FMODEX_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/)
     endif (FMODEX_LIBRARY AND FMODEX_INCLUDE_DIR)
-  endif (STANDALONE)
+  endif (USESYSTEMLIBS)
 endif (FMODEX)
 
diff --git a/indra/cmake/FindJsonCpp.cmake b/indra/cmake/FindJsonCpp.cmake
index 0b056ada58fe2cf96f9cdf600c66b13cf1f12a22..9398779cff9a87fe885337d7eba4b605f4325b94 100755
--- a/indra/cmake/FindJsonCpp.cmake
+++ b/indra/cmake/FindJsonCpp.cmake
@@ -23,10 +23,10 @@ EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
 
 # Try to find a library that was compiled with the same compiler version as we currently use.
 SET(JSONCPP_NAMES ${JSONCPP_NAMES} libjson_linux-gcc-${_gcc_COMPILER_VERSION}_libmt.so)
-IF (STANDALONE)
+IF (USESYSTEMLIBS)
     # On standalone, assume that the system installed library was compiled with the used compiler.
     SET(JSONCPP_NAMES ${JSONCPP_NAMES} libjson.so)
-ENDIF (STANDALONE)
+ENDIF (USESYSTEMLIBS)
 FIND_LIBRARY(JSONCPP_LIBRARY
   NAMES ${JSONCPP_NAMES}
   PATHS /usr/lib /usr/local/lib
diff --git a/indra/cmake/FreeType.cmake b/indra/cmake/FreeType.cmake
index c9a90a9a8da518f9f66df03439607edc203a81c2..02c5b37f28410fc81102f845d38f3a9049701ce2 100755
--- a/indra/cmake/FreeType.cmake
+++ b/indra/cmake/FreeType.cmake
@@ -1,14 +1,14 @@
 # -*- cmake -*-
 include(Prebuilt)
 
-if (STANDALONE)
+if (USESYSTEMLIBS)
   include(FindPkgConfig)
 
   pkg_check_modules(FREETYPE REQUIRED freetype2)
-else (STANDALONE)
+else (USESYSTEMLIBS)
   use_prebuilt_binary(freetype)
   set(FREETYPE_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
   set(FREETYPE_LIBRARIES freetype)
-endif (STANDALONE)
+endif (USESYSTEMLIBS)
 
 link_directories(${FREETYPE_LIBRARY_DIRS})
diff --git a/indra/cmake/GLEXT.cmake b/indra/cmake/GLEXT.cmake
index 0a3dd976b43354adf1d5d2768356e95b004fc10e..a74964420240ead615aadbcc10394b59cd1ccf8e 100644
--- a/indra/cmake/GLEXT.cmake
+++ b/indra/cmake/GLEXT.cmake
@@ -1,8 +1,8 @@
 # -*- cmake -*-
 include(Prebuilt)
 
-if (NOT STANDALONE)
+if (NOT USESYSTEMLIBS)
   use_prebuilt_binary(glext)
   use_prebuilt_binary(glh_linear)
   set(GLEXT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
-endif (NOT STANDALONE)
+endif (NOT USESYSTEMLIBS)
diff --git a/indra/cmake/GLH.cmake b/indra/cmake/GLH.cmake
index 911dbe4017172caf71f7bb7afb92d0b2df59f71c..d5262f2efa79acafca6fa6661a2bd81d6dcbbdd1 100755
--- a/indra/cmake/GLH.cmake
+++ b/indra/cmake/GLH.cmake
@@ -4,8 +4,8 @@ include(Prebuilt)
 set(GLH_FIND_REQUIRED TRUE)
 set(GLH_FIND_QUIETLY TRUE)
 
-if (STANDALONE)
+if (USESYSTEMLIBS)
   include(FindGLH)
-else (STANDALONE)
+else (USESYSTEMLIBS)
   use_prebuilt_binary(glh_linear)
-endif (STANDALONE)
+endif (USESYSTEMLIBS)
diff --git a/indra/cmake/GLOD.cmake b/indra/cmake/GLOD.cmake
index 6bdbaf621edf12e714299791c2cba7f675a11fbd..3683768af90cf4bac8092f41b077f3db39a2a398 100755
--- a/indra/cmake/GLOD.cmake
+++ b/indra/cmake/GLOD.cmake
@@ -1,9 +1,9 @@
 # -*- cmake -*-
 include(Prebuilt)
 
-if (NOT STANDALONE)
+if (NOT USESYSTEMLIBS)
   use_prebuilt_binary(GLOD)
-endif (NOT STANDALONE)
+endif (NOT USESYSTEMLIBS)
 
 set(GLOD_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
 set(GLOD_LIBRARIES GLOD)
diff --git a/indra/cmake/GStreamer010Plugin.cmake b/indra/cmake/GStreamer010Plugin.cmake
index d2d0699bcd72fc5de4bc751809af9074099953c3..cfd8565638059af3fddfd69468801b54d5ffbf31 100755
--- a/indra/cmake/GStreamer010Plugin.cmake
+++ b/indra/cmake/GStreamer010Plugin.cmake
@@ -1,7 +1,7 @@
 # -*- cmake -*-
 include(Prebuilt)
 
-if (STANDALONE)
+if (USESYSTEMLIBS)
   include(FindPkgConfig)
 
   pkg_check_modules(GSTREAMER010 REQUIRED gstreamer-0.10)
@@ -26,7 +26,7 @@ elseif (LINUX)
       gthread-2.0
       glib-2.0
       )
-endif (STANDALONE)
+endif (USESYSTEMLIBS)
 
 if (GSTREAMER010_FOUND AND GSTREAMER010_PLUGINS_BASE_FOUND)
   set(GSTREAMER010 ON CACHE BOOL "Build with GStreamer-0.10 streaming media support.")
diff --git a/indra/cmake/Glui.cmake b/indra/cmake/Glui.cmake
index f62a56856c69867c14e01a09b083ba9acbca9f28..db353a91ecaa9d85d1c3c0a1920980c26c16d756 100755
--- a/indra/cmake/Glui.cmake
+++ b/indra/cmake/Glui.cmake
@@ -2,14 +2,14 @@
 include(Linking)
 include(Prebuilt)
 
-if (STANDALONE)
+if (USESYSTEMLIBS)
     set(GLUI OFF CACHE BOOL
         "GLUI support for the llplugin/llmedia test apps.")
-else (STANDALONE)
+else (USESYSTEMLIBS)
     use_prebuilt_binary(glui)
     set(GLUI ON CACHE BOOL
         "GLUI support for the llplugin/llmedia test apps.")
-endif (STANDALONE)
+endif (USESYSTEMLIBS)
 
 if (LINUX)
     set(GLUI ON CACHE BOOL
diff --git a/indra/cmake/GoogleBreakpad.cmake b/indra/cmake/GoogleBreakpad.cmake
index 7f9ba4ea8ea8a0a1ff237cc4e0d53daf211f5120..829e1ac08a8d8dbd044698a21324b377adbaebec 100755
--- a/indra/cmake/GoogleBreakpad.cmake
+++ b/indra/cmake/GoogleBreakpad.cmake
@@ -1,10 +1,10 @@
 # -*- cmake -*-
 include(Prebuilt)
 
-if (STANDALONE)
+if (USESYSTEMLIBS)
   set(BREAKPAD_EXCEPTION_HANDLER_FIND_REQUIRED ON)
   include(FindGoogleBreakpad)
-else (STANDALONE)
+else (USESYSTEMLIBS)
   use_prebuilt_binary(google_breakpad)
   if (DARWIN)
     set(BREAKPAD_EXCEPTION_HANDLER_LIBRARIES exception_handler)
@@ -18,5 +18,5 @@ else (STANDALONE)
   # yes, this does look dumb, no, it's not incorrect
   #
   set(BREAKPAD_INCLUDE_DIRECTORIES "${LIBS_PREBUILT_DIR}/include/google_breakpad" "${LIBS_PREBUILT_DIR}/include/google_breakpad/google_breakpad")
-endif (STANDALONE)
+endif (USESYSTEMLIBS)
 
diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake
index f3fd008e492cb99183507e4acfc980f69ef301a2..c1faeb9325241f4f54298fb6b97d9ddc3cd68b97 100755
--- a/indra/cmake/GooglePerfTools.cmake
+++ b/indra/cmake/GooglePerfTools.cmake
@@ -5,9 +5,9 @@ include(Prebuilt)
 # set ON or OFF as desired.
 set (USE_TCMALLOC OFF)
 
-if (STANDALONE)
+if (USESYSTEMLIBS)
   include(FindGooglePerfTools)
-else (STANDALONE)
+else (USESYSTEMLIBS)
   if (WINDOWS)
     if (USE_TCMALLOC)
        use_prebuilt_binary(gperftools)
@@ -34,7 +34,7 @@ else (STANDALONE)
         ${LIBS_PREBUILT_DIR}/include)
     set(GOOGLE_PERFTOOLS_FOUND "YES")
   endif (LINUX)
-endif (STANDALONE)
+endif (USESYSTEMLIBS)
 
 if (GOOGLE_PERFTOOLS_FOUND)
   # XXX Disable temporarily, until we have compilation issues on 64-bit
diff --git a/indra/cmake/Hunspell.cmake b/indra/cmake/Hunspell.cmake
index 0c9cf933161c5efab2c787c877bf069fd838f6a4..ef74d95b2a6711f9e2fc20eba393a58242389bda 100755
--- a/indra/cmake/Hunspell.cmake
+++ b/indra/cmake/Hunspell.cmake
@@ -4,9 +4,9 @@ include(Prebuilt)
 set(HUNSPELL_FIND_QUIETLY ON)
 set(HUNSPELL_FIND_REQUIRED ON)
 
-if (STANDALONE)
+if (USESYSTEMLIBS)
   include(FindHUNSPELL)
-else (STANDALONE)
+else (USESYSTEMLIBS)
   use_prebuilt_binary(libhunspell)
   if (WINDOWS)
     set(HUNSPELL_LIBRARY libhunspell)
@@ -19,4 +19,4 @@ else (STANDALONE)
   endif()
   set(HUNSPELL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/hunspell)
   use_prebuilt_binary(dictionaries)
-endif (STANDALONE)
+endif (USESYSTEMLIBS)
diff --git a/indra/cmake/JPEG.cmake b/indra/cmake/JPEG.cmake
index 4f99efd60276218d50268fb068e7df1b58f6d7f6..d6da22aecc1f0c58e144b32ced8a31626a8ad095 100755
--- a/indra/cmake/JPEG.cmake
+++ b/indra/cmake/JPEG.cmake
@@ -5,9 +5,9 @@ include(Linking)
 set(JPEG_FIND_QUIETLY ON)
 set(JPEG_FIND_REQUIRED ON)
 
-if (STANDALONE)
+if (USESYSTEMLIBS)
   include(FindJPEG)
-else (STANDALONE)
+else (USESYSTEMLIBS)
   use_prebuilt_binary(jpeglib)
   if (LINUX)
     set(JPEG_LIBRARIES jpeg)
@@ -17,4 +17,4 @@ else (STANDALONE)
     set(JPEG_LIBRARIES jpeglib)
   endif (LINUX)
   set(JPEG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
-endif (STANDALONE)
+endif (USESYSTEMLIBS)
diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake
index 7ad73e56830a50869ef90bd988db47240d06235b..0aab2d66340d7bcaf9e16a3d39ceea6d35a1e3f9 100755
--- a/indra/cmake/JsonCpp.cmake
+++ b/indra/cmake/JsonCpp.cmake
@@ -5,9 +5,9 @@ include(Prebuilt)
 set(JSONCPP_FIND_QUIETLY ON)
 set(JSONCPP_FIND_REQUIRED ON)
 
-if (STANDALONE)
+if (USESYSTEMLIBS)
   include(FindJsonCpp)
-else (STANDALONE)
+else (USESYSTEMLIBS)
   use_prebuilt_binary(jsoncpp)
   if (WINDOWS)
     set(JSONCPP_LIBRARIES 
@@ -19,4 +19,4 @@ else (STANDALONE)
     set(JSONCPP_LIBRARIES libjson_linux-gcc-4.1.3_libmt.a)
   endif (WINDOWS)
   set(JSONCPP_INCLUDE_DIR "${LIBS_PREBUILT_DIR}/include/jsoncpp" "${LIBS_PREBUILT_DIR}/include/json")
-endif (STANDALONE)
+endif (USESYSTEMLIBS)
diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake
index 9bb3077797db94c929b803c68a4f977a51c354d1..4e6c41e528dc4368ff50898bece6c123ccaa37b0 100644
--- a/indra/cmake/LLAddBuildTest.cmake
+++ b/indra/cmake/LLAddBuildTest.cmake
@@ -202,9 +202,9 @@ FUNCTION(LL_ADD_INTEGRATION_TEST
   ADD_EXECUTABLE(INTEGRATION_TEST_${testname} ${source_files})
   SET_TARGET_PROPERTIES(INTEGRATION_TEST_${testname} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${EXE_STAGING_DIR}")
 
-  if(STANDALONE)
+  if(USESYSTEMLIBS)
     SET_TARGET_PROPERTIES(INTEGRATION_TEST_${testname} PROPERTIES COMPILE_FLAGS -I"${TUT_INCLUDE_DIR}")
-  endif(STANDALONE)
+  endif(USESYSTEMLIBS)
 
   # The following was copied to llcorehttp/CMakeLists.txt's texture_load target. 
   # Any changes made here should be replicated there.
@@ -275,10 +275,10 @@ MACRO(SET_TEST_PATH LISTVAR)
     set(${LISTVAR} ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/Resources ${SHARED_LIB_STAGING_DIR}/Release/Resources /usr/lib)
   ELSE(WINDOWS)
     # Linux uses a single staging directory anyway.
-    IF (STANDALONE)
+    IF (USESYSTEMLIBS)
       set(${LISTVAR} ${CMAKE_BINARY_DIR}/llcommon /usr/lib /usr/local/lib)
-    ELSE (STANDALONE)
+    ELSE (USESYSTEMLIBS)
       set(${LISTVAR} ${SHARED_LIB_STAGING_DIR} /usr/lib)
-    ENDIF (STANDALONE)
+    ENDIF (USESYSTEMLIBS)
   ENDIF(WINDOWS)
 ENDMACRO(SET_TEST_PATH)
diff --git a/indra/cmake/LLWindow.cmake b/indra/cmake/LLWindow.cmake
index ad732ef650d71f3707ff224daa75db2064cf8b41..ba07a80f051af43e9165f8f74c01f6b99be28198 100755
--- a/indra/cmake/LLWindow.cmake
+++ b/indra/cmake/LLWindow.cmake
@@ -4,7 +4,7 @@ include(Variables)
 include(GLEXT)
 include(Prebuilt)
 
-if (STANDALONE)
+if (USESYSTEMLIBS)
   include(FindSDL)
 
   # This should be done by FindSDL.  Sigh.
@@ -13,14 +13,14 @@ if (STANDALONE)
       SDL_INCLUDE_DIR
       SDL_LIBRARY
       )
-else (STANDALONE)
+else (USESYSTEMLIBS)
   if (LINUX)
     use_prebuilt_binary(SDL)
     set (SDL_FOUND TRUE)
     set (SDL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/i686-linux)
     set (SDL_LIBRARY SDL directfb fusion direct)
   endif (LINUX)
-endif (STANDALONE)
+endif (USESYSTEMLIBS)
 
 if (SDL_FOUND)
   include_directories(${SDL_INCLUDE_DIR})
diff --git a/indra/cmake/NDOF.cmake b/indra/cmake/NDOF.cmake
index be6fe415f2df79ce264192c1c5ec5de270e471bd..e72845db530aa0f899fa28002432b716bbad48fe 100755
--- a/indra/cmake/NDOF.cmake
+++ b/indra/cmake/NDOF.cmake
@@ -4,10 +4,10 @@ include(Prebuilt)
 set(NDOF ON CACHE BOOL "Use NDOF space navigator joystick library.")
 
 if (NDOF)
-  if (STANDALONE)
+  if (USESYSTEMLIBS)
     set(NDOF_FIND_REQUIRED ON)
     include(FindNDOF)
-  else (STANDALONE)
+  else (USESYSTEMLIBS)
     use_prebuilt_binary(ndofdev)
 
     if (WINDOWS)
@@ -18,7 +18,7 @@ if (NDOF)
 
     set(NDOF_INCLUDE_DIR ${ARCH_PREBUILT_DIRS}/include/ndofdev)
     set(NDOF_FOUND 1)
-  endif (STANDALONE)
+  endif (USESYSTEMLIBS)
 endif (NDOF)
 
 if (NDOF_FOUND)
diff --git a/indra/cmake/OPENAL.cmake b/indra/cmake/OPENAL.cmake
index a3e1fb924edfb7930db00ea06b74e0e02a960e91..c084d68de78d63b74a104b312595c7e3d6ffd01e 100755
--- a/indra/cmake/OPENAL.cmake
+++ b/indra/cmake/OPENAL.cmake
@@ -10,14 +10,14 @@ endif (LINUX)
 
 if (OPENAL)
   set(OPENAL_LIB_INCLUDE_DIRS "${LIBS_PREBUILT_DIR}/include/AL")
-  if (STANDALONE)
+  if (USESYSTEMLIBS)
     include(FindPkgConfig)
     include(FindOpenAL)
     pkg_check_modules(OPENAL_LIB REQUIRED openal)
     pkg_check_modules(FREEALUT_LIB REQUIRED freealut)
-  else (STANDALONE)
+  else (USESYSTEMLIBS)
     use_prebuilt_binary(openal_soft)
-  endif (STANDALONE)
+  endif (USESYSTEMLIBS)
   if(WINDOWS)
     set(OPENAL_LIBRARIES 
       OpenAL32
diff --git a/indra/cmake/OpenJPEG.cmake b/indra/cmake/OpenJPEG.cmake
index fcc82c2f497b41d5f28e97293e7ff1881a61acab..bf0bde2ba7b85084765c2e8bde21a24fb090be75 100755
--- a/indra/cmake/OpenJPEG.cmake
+++ b/indra/cmake/OpenJPEG.cmake
@@ -4,9 +4,9 @@ include(Prebuilt)
 set(OPENJPEG_FIND_QUIETLY ON)
 set(OPENJPEG_FIND_REQUIRED ON)
 
-if (STANDALONE)
+if (USESYSTEMLIBS)
   include(FindOpenJPEG)
-else (STANDALONE)
+else (USESYSTEMLIBS)
   use_prebuilt_binary(openjpeg)
   
   if(WINDOWS)
@@ -19,4 +19,4 @@ else (STANDALONE)
   endif(WINDOWS)
   
     set(OPENJPEG_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/openjpeg)
-endif (STANDALONE)
+endif (USESYSTEMLIBS)
diff --git a/indra/cmake/OpenSSL.cmake b/indra/cmake/OpenSSL.cmake
index 2704912eb5f814db350401fcdacead715ce9c4bd..5b469f74f9a12d1085d3cfa8886fdcd7a03f8f89 100755
--- a/indra/cmake/OpenSSL.cmake
+++ b/indra/cmake/OpenSSL.cmake
@@ -4,9 +4,9 @@ include(Prebuilt)
 set(OpenSSL_FIND_QUIETLY ON)
 set(OpenSSL_FIND_REQUIRED ON)
 
-if (STANDALONE)
+if (USESYSTEMLIBS)
   include(FindOpenSSL)
-else (STANDALONE)
+else (USESYSTEMLIBS)
   use_prebuilt_binary(openSSL)
   if (WINDOWS)
     set(OPENSSL_LIBRARIES ssleay32 libeay32)
@@ -14,7 +14,7 @@ else (STANDALONE)
     set(OPENSSL_LIBRARIES ssl crypto)
   endif (WINDOWS)
   set(OPENSSL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
-endif (STANDALONE)
+endif (USESYSTEMLIBS)
 
 if (LINUX)
   set(CRYPTO_LIBRARIES crypto)
diff --git a/indra/cmake/PNG.cmake b/indra/cmake/PNG.cmake
index 913c5756727cde3dfa901da43353fa39423d1370..173d59391e1ebb33f5e79a6a7034552b4eed17fd 100755
--- a/indra/cmake/PNG.cmake
+++ b/indra/cmake/PNG.cmake
@@ -4,9 +4,9 @@ include(Prebuilt)
 set(PNG_FIND_QUIETLY ON)
 set(PNG_FIND_REQUIRED ON)
 
-if (STANDALONE)
+if (USESYSTEMLIBS)
   include(FindPNG)
-else (STANDALONE)
+else (USESYSTEMLIBS)
   use_prebuilt_binary(libpng)
   if (WINDOWS)
     set(PNG_LIBRARIES libpng15)
@@ -18,4 +18,4 @@ else (STANDALONE)
     set(PNG_LIBRARIES png15)
     set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng15)
   endif()
-endif (STANDALONE)
+endif (USESYSTEMLIBS)
diff --git a/indra/cmake/Prebuilt.cmake b/indra/cmake/Prebuilt.cmake
index ac0cbde25322fa81a1b7a27197fb874a51f1abc1..c3fd8f1666a14e8518617c645ca8dfceb83272cc 100755
--- a/indra/cmake/Prebuilt.cmake
+++ b/indra/cmake/Prebuilt.cmake
@@ -18,7 +18,7 @@ endif(INSTALL_PROPRIETARY)
 # ${CMAKE_BINARY_DIR}/temp/${_binary}_installed)
 macro (use_prebuilt_binary _binary)
   if (NOT DEFINED STANDALONE_${_binary})
-    set(STANDALONE_${_binary} ${STANDALONE})
+    set(STANDALONE_${_binary} ${USESYSTEMLIBS})
   endif (NOT DEFINED STANDALONE_${_binary})
 
   if (NOT STANDALONE_${_binary})
diff --git a/indra/cmake/PulseAudio.cmake b/indra/cmake/PulseAudio.cmake
index 360a971058717b989bee052de2e8a99d72ea5a37..cce27f1bdd12afb10e018f9d530d93512fd92126 100755
--- a/indra/cmake/PulseAudio.cmake
+++ b/indra/cmake/PulseAudio.cmake
@@ -4,7 +4,7 @@ include(Prebuilt)
 set(PULSEAUDIO OFF CACHE BOOL "Build with PulseAudio support, if available.")
 
 if (PULSEAUDIO)
-  if (STANDALONE)
+  if (USESYSTEMLIBS)
     include(FindPkgConfig)
 
     pkg_check_modules(PULSEAUDIO libpulse)
@@ -20,7 +20,7 @@ if (PULSEAUDIO)
     set(PULSEAUDIO_LIBRARIES
       # none needed!
       )
-  endif (STANDALONE)
+  endif (USESYSTEMLIBS)
 endif (PULSEAUDIO)
 
 if (PULSEAUDIO_FOUND)
diff --git a/indra/cmake/Tut.cmake b/indra/cmake/Tut.cmake
index 7488e9dcb0b7c02c059faa342e975eb5d7c17ed1..e11a3c3314c2862ecb4025d903ad1664bd651c7a 100755
--- a/indra/cmake/Tut.cmake
+++ b/indra/cmake/Tut.cmake
@@ -1,6 +1,6 @@
 # -*- cmake -*-
 include(Prebuilt)
 
-if (NOT STANDALONE)
+if (NOT USESYSTEMLIBS)
   use_prebuilt_binary(tut)
-endif(NOT STANDALONE)
+endif(NOT USESYSTEMLIBS)
diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake
index d0fd4df03a225550b84f72ad650ade3a6bfda6b3..58acdc22bd37d58fdf724801c09eb02bbe9825af 100755
--- a/indra/cmake/UI.cmake
+++ b/indra/cmake/UI.cmake
@@ -2,7 +2,7 @@
 include(Prebuilt)
 include(FreeType)
 
-if (STANDALONE)
+if (USESYSTEMLIBS)
   include(FindPkgConfig)
     
   if (LINUX)
@@ -31,7 +31,7 @@ if (STANDALONE)
     list(APPEND UI_LIBRARIES ${${pkg}_LIBRARIES})
     add_definitions(${${pkg}_CFLAGS_OTHERS})
   endforeach(pkg)
-else (STANDALONE)
+else (USESYSTEMLIBS)
   use_prebuilt_binary(gtk-atk-pango-glib)
   if (LINUX)
     set(UI_LIBRARIES
@@ -59,7 +59,7 @@ else (STANDALONE)
   foreach(include ${${LL_ARCH}_INCLUDES})
       include_directories(${LIBS_PREBUILT_DIR}/include/${include})
   endforeach(include)
-endif (STANDALONE)
+endif (USESYSTEMLIBS)
 
 if (LINUX)
   add_definitions(-DLL_GTK=1 -DLL_X11=1)
diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake
index 22d0a7f0fe03d8b0ef886633e0486ca0c849c2ba..963b1bd386eebca3d944a335eddd84ac3e642836 100755
--- a/indra/cmake/Variables.cmake
+++ b/indra/cmake/Variables.cmake
@@ -183,7 +183,7 @@ if (XCODE_VERSION GREATER 4.2)
 endif (XCODE_VERSION GREATER 4.2)
 
 set(VERSION_BUILD "0" CACHE STRING "Revision number passed in from the outside")
-set(STANDALONE OFF CACHE BOOL "Do not use Linden-supplied prebuilt libraries.")
+set(USESYSTEMLIBS OFF CACHE BOOL "Use libraries from your system rather than Linden-supplied prebuilt libraries.")
 set(UNATTENDED OFF CACHE BOOL "Should be set to ON for building with VC Express editions.")
 
 set(USE_PRECOMPILED_HEADERS ON CACHE BOOL "Enable use of precompiled header directives where supported.")
diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake
index 5b00c989a4bd267dd1f1a2f23053339cafd68ab0..d4be24799f43c495b903d172b4ff2fef7333e98b 100755
--- a/indra/cmake/ViewerMiscLibs.cmake
+++ b/indra/cmake/ViewerMiscLibs.cmake
@@ -1,10 +1,10 @@
 # -*- cmake -*-
 include(Prebuilt)
 
-if (NOT STANDALONE)
+if (NOT USESYSTEMLIBS)
   use_prebuilt_binary(libhunspell)
   use_prebuilt_binary(libuuid)
   use_prebuilt_binary(slvoice)
   use_prebuilt_binary(fontconfig)
-endif(NOT STANDALONE)
+endif(NOT USESYSTEMLIBS)
 
diff --git a/indra/cmake/WebKitLibPlugin.cmake b/indra/cmake/WebKitLibPlugin.cmake
index d9df78bfc8fdec62c4261b6c74208c047e999e51..76f2c148db634ac3a62564d3142d6fcd348bda83 100755
--- a/indra/cmake/WebKitLibPlugin.cmake
+++ b/indra/cmake/WebKitLibPlugin.cmake
@@ -2,7 +2,7 @@
 include(Linking)
 include(Prebuilt)
 
-if (STANDALONE)
+if (USESYSTEMLIBS)
   # The minimal version, 4.4.3, is rather arbitrary: it's the version in Debian/Lenny.
   find_package(Qt4 4.4.3 COMPONENTS QtCore QtGui QtNetwork QtOpenGL QtWebKit REQUIRED)
   include(${QT_USE_FILE})
@@ -28,11 +28,11 @@ if (STANDALONE)
   list(APPEND QT_PLUGIN_LIBRARIES jpeg)
     set(WEBKITLIBPLUGIN OFF CACHE BOOL
         "WEBKITLIBPLUGIN support for the llplugin/llmedia test apps.")
-else (STANDALONE)
+else (USESYSTEMLIBS)
     use_prebuilt_binary(llqtwebkit)
     set(WEBKITLIBPLUGIN ON CACHE BOOL
         "WEBKITLIBPLUGIN support for the llplugin/llmedia test apps.")
-endif (STANDALONE)
+endif (USESYSTEMLIBS)
 
 if (WINDOWS)
     set(WEBKIT_PLUGIN_LIBRARIES 
diff --git a/indra/cmake/XmlRpcEpi.cmake b/indra/cmake/XmlRpcEpi.cmake
index 5bd48482450415f829336eb962d8d141d4611ab4..3a0caa0a069f23fe7a5096235d2d06928525fdf6 100755
--- a/indra/cmake/XmlRpcEpi.cmake
+++ b/indra/cmake/XmlRpcEpi.cmake
@@ -4,9 +4,9 @@ include(Prebuilt)
 set(XMLRPCEPI_FIND_QUIETLY ON)
 set(XMLRPCEPI_FIND_REQUIRED ON)
 
-if (STANDALONE)
+if (USESYSTEMLIBS)
   include(FindXmlRpcEpi)
-else (STANDALONE)
+else (USESYSTEMLIBS)
     use_prebuilt_binary(xmlrpc-epi)
     if (WINDOWS)
         set(XMLRPCEPI_LIBRARIES 
@@ -17,4 +17,4 @@ else (STANDALONE)
         set(XMLRPCEPI_LIBRARIES xmlrpc-epi)
     endif (WINDOWS)
     set(XMLRPCEPI_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
-endif (STANDALONE)
+endif (USESYSTEMLIBS)
diff --git a/indra/cmake/ZLIB.cmake b/indra/cmake/ZLIB.cmake
index 48e5130ad5c48a7a03f3f395a0b78e398459e6ce..b99a8644c92ca2d637264d5b87a2c052194b7f39 100755
--- a/indra/cmake/ZLIB.cmake
+++ b/indra/cmake/ZLIB.cmake
@@ -5,9 +5,9 @@ set(ZLIB_FIND_REQUIRED ON)
 
 include(Prebuilt)
 
-if (STANDALONE)
+if (USESYSTEMLIBS)
   include(FindZLIB)
-else (STANDALONE)
+else (USESYSTEMLIBS)
   use_prebuilt_binary(zlib)
   if (WINDOWS)
     set(ZLIB_LIBRARIES 
@@ -19,4 +19,4 @@ else (STANDALONE)
   if (WINDOWS OR LINUX)
     set(ZLIB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/zlib)
   endif (WINDOWS OR LINUX)
-endif (STANDALONE)
+endif (USESYSTEMLIBS)
diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp
index ad4fce6f359b8dbb6277402ed615394c98de118a..77841918ca06ef8240a7965ec5eb96b368eb8194 100755
--- a/indra/llcommon/llsdserialize.cpp
+++ b/indra/llcommon/llsdserialize.cpp
@@ -34,7 +34,7 @@
 #include <iostream>
 #include "apr_base64.h"
 
-#ifdef LL_STANDALONE
+#ifdef LL_USESYSTEMLIBS
 # include <zlib.h>
 #else
 # include "zlib/zlib.h"  // for davep's dirty little zip functions
diff --git a/indra/llcommon/llsdserialize_xml.cpp b/indra/llcommon/llsdserialize_xml.cpp
index 614a2d563656693ec5950a13b5968faa30a80c23..4f2a65204460e4f6b6866151e6ca28abf435b0b7 100755
--- a/indra/llcommon/llsdserialize_xml.cpp
+++ b/indra/llcommon/llsdserialize_xml.cpp
@@ -35,7 +35,7 @@
 
 extern "C"
 {
-#ifdef LL_STANDALONE
+#ifdef LL_USESYSTEMLIBS
 # include <expat.h>
 #else
 # include "expat/expat.h"
diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp
index e63045659e22c803656405743660c8609fbb701b..436745c5e4434b8239544eff6ac81365cdbfc226 100755
--- a/indra/llcommon/llsys.cpp
+++ b/indra/llcommon/llsys.cpp
@@ -33,7 +33,7 @@
 #include "llsys.h"
 
 #include <iostream>
-#ifdef LL_STANDALONE
+#ifdef LL_USESYSTEMLIBS
 # include <zlib.h>
 #else
 # include "zlib/zlib.h"
diff --git a/indra/llimage/llimagejpeg.h b/indra/llimage/llimagejpeg.h
index 7ac7f5d2e0ac916794b27b7cde905f46e43f3fac..3d364551a97ad2b6a743261904f94c3431a64184 100755
--- a/indra/llimage/llimagejpeg.h
+++ b/indra/llimage/llimagejpeg.h
@@ -32,7 +32,7 @@
 #include "llimage.h"
 
 extern "C" {
-#ifdef LL_STANDALONE
+#ifdef LL_USESYSTEMLIBS
 # include <jpeglib.h>
 # include <jerror.h>
 #else
diff --git a/indra/llmessage/llares.h b/indra/llmessage/llares.h
index 800781ee884059bd9c9477ee6b754b0777e94646..675120c6210b9fde58d4a89738c5b2bfae572eb7 100755
--- a/indra/llmessage/llares.h
+++ b/indra/llmessage/llares.h
@@ -39,7 +39,7 @@
 # pragma warning(pop)
 #endif
 
-#ifdef LL_STANDALONE
+#ifdef LL_USESYSTEMLIBS
 # include <ares.h>
 #else
 # include <ares/ares.h>
diff --git a/indra/llmessage/llhttpassetstorage.cpp b/indra/llmessage/llhttpassetstorage.cpp
index 7dcf160c9ba9c3ccb8d88a4b84d09cdbbac7d01f..9a6b1e0eb70337eb702af4c2bf1064377491c939 100755
--- a/indra/llmessage/llhttpassetstorage.cpp
+++ b/indra/llmessage/llhttpassetstorage.cpp
@@ -37,7 +37,7 @@
 #include "llvfile.h"
 #include "llvfs.h"
 
-#ifdef LL_STANDALONE
+#ifdef LL_USESYSTEMLIBS
 # include <zlib.h>
 #else
 # include "zlib/zlib.h"
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp
index 34e0483a835d7f751a88edd63fceddf7d7741893..36d9232cca3dd85ed26ce12e9988a13ad00a2616 100755
--- a/indra/llprimitive/llmodel.cpp
+++ b/indra/llprimitive/llmodel.cpp
@@ -44,7 +44,7 @@
 #pragma warning (default : 4264)
 #endif
 
-#ifdef LL_STANDALONE
+#ifdef LL_USESYSTEMLIBS
 # include <zlib.h>
 #else
 # include "zlib/zlib.h"
diff --git a/indra/llui/llxuiparser.cpp b/indra/llui/llxuiparser.cpp
index 6322da91235d90a3084371f61d8d03503828b2cd..0b84b9f6944e19d26773da8df9fe33ed700b1781 100755
--- a/indra/llui/llxuiparser.cpp
+++ b/indra/llui/llxuiparser.cpp
@@ -30,7 +30,7 @@
 
 #include "llxmlnode.h"
 
-#ifdef LL_STANDALONE
+#ifdef LL_USESYSTEMLIBS
 #include <expat.h>
 #else
 #include "expat/expat.h"
diff --git a/indra/llxml/llxmlnode.h b/indra/llxml/llxmlnode.h
index ec486d7957eb8e030bb9769d5dd7cdc6f9af7f3f..c1c0bfe5d095f629f6b2d55aed26b7da4dc624a1 100755
--- a/indra/llxml/llxmlnode.h
+++ b/indra/llxml/llxmlnode.h
@@ -30,7 +30,7 @@
 #ifndef XML_STATIC
 #define XML_STATIC
 #endif
-#ifdef LL_STANDALONE
+#ifdef LL_USESYSTEMLIBS
 #include <expat.h>
 #else
 #include "expat/expat.h"
diff --git a/indra/llxml/llxmlparser.h b/indra/llxml/llxmlparser.h
index e0f8b694526b18365b0485a2a97b6c0846b164a6..a5b210404f8d809383aea20b4583066795b37f65 100755
--- a/indra/llxml/llxmlparser.h
+++ b/indra/llxml/llxmlparser.h
@@ -30,7 +30,7 @@
 #ifndef XML_STATIC
 #define XML_STATIC
 #endif
-#ifdef LL_STANDALONE
+#ifdef LL_USESYSTEMLIBS
 #include <expat.h>
 #else
 #include "expat/expat.h"
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 0bf0152b303a9f6c2f18160e26fc3833a879bdb0..a040841e3bbd5962d867eb40b2be8d5f5d692507 100755
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1457,9 +1457,9 @@ if (WINDOWS)
 
     SOURCE_GROUP("Resource Files" FILES ${viewer_RESOURCE_FILES})
 
-    if (NOT STANDALONE)
+    if (NOT USESYSTEMLIBS)
         list(APPEND viewer_SOURCE_FILES ${viewer_RESOURCE_FILES})
-    endif (NOT STANDALONE)
+    endif (NOT USESYSTEMLIBS)
 
     find_library(DINPUT_LIBRARY dinput8 ${DIRECTX_LIBRARY_DIR})
     find_library(DXGUID_LIBRARY dxguid ${DIRECTX_LIBRARY_DIR})
@@ -1570,9 +1570,9 @@ source_group("Character File" FILES ${viewer_CHARACTER_FILES})
 
 set_source_files_properties(${viewer_CHARACTER_FILES}
                             PROPERTIES HEADER_FILE_ONLY TRUE)
-if (NOT STANDALONE)
+if (NOT USESYSTEMLIBS)
     list(APPEND viewer_SOURCE_FILES ${viewer_CHARACTER_FILES})
-endif (NOT STANDALONE)
+endif (NOT USESYSTEMLIBS)
 
 if (WINDOWS)
   file(GLOB viewer_INSTALLER_FILES installers/windows/*.nsi)
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index 63c69b4481529c66d11bc158bdade5df3e24165a..816ca705343cf934b539fe4ec2aa11beb73b0e76 100755
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -68,7 +68,7 @@
 #include "u64.h"
 #include "llviewertexturelist.h"
 #include "lldatapacker.h"
-#ifdef LL_STANDALONE
+#ifdef LL_USESYSTEMLIBS
 #include <zlib.h>
 #else
 #include "zlib/zlib.h"
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index 050d9dd7858ebbcf7edde2efcba339e3f55b6432..b9856e3a832d0d1d4c76a556e1ef28b8daff73bc 100755
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -35,7 +35,7 @@
 #include "llbufferstream.h"
 #include "llfile.h"
 #include "llmenugl.h"
-#ifdef LL_STANDALONE
+#ifdef LL_USESYSTEMLIBS
 # include "expat.h"
 #else
 # include "expat/expat.h"
diff --git a/indra/newview/llvoicevivox.h b/indra/newview/llvoicevivox.h
index c325d72ba6a828d170cb083440afe778eaf204da..5e876fa2ef55ead08bef94aa66d5fa337587f846 100755
--- a/indra/newview/llvoicevivox.h
+++ b/indra/newview/llvoicevivox.h
@@ -38,7 +38,7 @@ class LLVivoxProtocolParser;
 #include "llviewerregion.h"
 #include "llcallingcard.h"   // for LLFriendObserver
 
-#ifdef LL_STANDALONE
+#ifdef LL_USESYSTEMLIBS
 # include "expat.h"
 #else
 # include "expat/expat.h"