10 files changed, 68 insertions, 18 deletions

diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
index 1a24a41..9ff5906 100644
--- a/linden/indra/cmake/00-Common.cmake
+++ b/linden/indra/cmake/00-Common.cmake
@@ -1,6 +1,6 @@
 # -*- cmake -*-
 #
-# Compilation options shared by all Second Life components.
+# Compilation options shared by all components.
 
 include(Variables)
 
@@ -69,6 +69,10 @@ if (WINDOWS)
       /MP
       )
      
+  add_definitions(
+      /DUSE_OTR=1
+      )
+     
   if(MSVC80 OR MSVC90)
     set(CMAKE_CXX_FLAGS_RELEASE
       "${CMAKE_CXX_FLAGS_RELEASE} -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0"
@@ -149,6 +153,10 @@ if (LINUX)
       -pthread
       )
 
+    add_definitions(
+        -DUSE_OTR=1
+        )
+
   if (SERVER)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftemplate-depth-60")
     if (EXISTS /etc/debian_version)
@@ -172,7 +180,8 @@ if (LINUX)
   endif (SERVER)
 
   if (VIEWER)
-    add_definitions(-DAPPID=imprudence)
+    # Hmm, APPID does not seem to be used anywhere, but might be used implicitly somewhere.  It also does not like being "meta-impy", so changing this to stop it bitching.
+    add_definitions(-DAPPID=metaImpy)
     add_definitions(-fvisibility=hidden)
     # don't catch SIGCHLD in our base application class for the viewer - some of our 3rd party libs may need their *own* SIGCHLD handler to work.  Sigh!  The viewer doesn't need to catch SIGCHLD anyway.
     add_definitions(-DLL_IGNORE_SIGCHLD)
@@ -195,6 +204,11 @@ endif (LINUX)
 
 if (DARWIN)
   add_definitions(-DLL_DARWIN=1)
+
+  add_definitions(
+    -DUSE_OTR=1
+  )
+
   set(CMAKE_CXX_LINK_FLAGS "-Wl,-headerpad_max_install_names,-search_paths_first")
   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_CXX_LINK_FLAGS}")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mlong-branch -msse3 -mssse3 -w")
diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake
index 78c7c96..e7f1aa3 100644
--- a/linden/indra/cmake/CopyWinLibs.cmake
+++ b/linden/indra/cmake/CopyWinLibs.cmake
@@ -1,7 +1,7 @@
 # -*- cmake -*-
 
 # The copy_win_libs folder contains file lists and a script used to 
-# copy dlls, exes and such needed to run Imprudence from within 
+# copy dlls, exes and such needed to run meta-impy from within 
 # VisualStudio. 
 
 include(CMakeCopyIfDifferent)
@@ -404,7 +404,7 @@ if(EXISTS ${debug_msvc8_redist_path})
         ARGS
           ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
           ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest
-          ${CMAKE_CURRENT_SOURCE_DIR}/ImprudenceDebug.exe.config
+          ${CMAKE_CURRENT_SOURCE_DIR}/meta-impyDebug.exe.config
           ${debug_appconfig_file}
         DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest
         COMMENT "Creating debug app config file"
@@ -449,7 +449,7 @@ if(EXISTS ${release_msvc8_redist_path})
         ARGS
           ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
           ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest
-          ${CMAKE_CURRENT_SOURCE_DIR}/Imprudence.exe.config
+          ${CMAKE_CURRENT_SOURCE_DIR}/meta-impy.exe.config
           ${release_appconfig_file}
         DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest
         COMMENT "Creating release app config file"
@@ -462,7 +462,7 @@ if(EXISTS ${release_msvc8_redist_path})
         ARGS
           ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
           ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest
-          ${CMAKE_CURRENT_SOURCE_DIR}/Imprudence.exe.config
+          ${CMAKE_CURRENT_SOURCE_DIR}/meta-impy.exe.config
           ${relwithdebinfo_appconfig_file}
         DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest
         COMMENT "Creating relwithdebinfo app config file"
diff --git a/linden/indra/cmake/Python.cmake b/linden/indra/cmake/Python.cmake
index e4257f4..6cdd559 100644
--- a/linden/indra/cmake/Python.cmake
+++ b/linden/indra/cmake/Python.cmake
@@ -6,15 +6,15 @@ if (WINDOWS)
   # On Windows, explicitly avoid Cygwin Python.
 
   find_program(PYTHON_EXECUTABLE
-    NAMES python25.exe python23.exe python.exe
+    NAMES python27.exe python26.exe python25.exe python24.exe python23.exe python.exe
     NO_DEFAULT_PATH # added so that cmake does not find cygwin python
     PATHS
-        [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.7\\InstallPath]
+    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.7\\InstallPath]
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]
-        [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.7\\InstallPath]
+    [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.7\\InstallPath]
     [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]
     [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]
     [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]
@@ -23,7 +23,7 @@ if (WINDOWS)
 elseif (EXISTS /etc/debian_version)
   # On Debian and Ubuntu, avoid Python 2.4 if possible.
 
-  find_program(PYTHON_EXECUTABLE python2.5 python2.3 python PATHS /usr/bin)
+  find_program(PYTHON_EXECUTABLE python2.7 python2.6 python2.5 python2.3 python PATHS /usr/bin)
 
   if (PYTHON_EXECUTABLE)
     set(PYTHONINTERP_FOUND ON)
@@ -33,7 +33,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 
   string(REPLACE ":" ";" PATH_LIST "$ENV{PATH}")
   find_program(PYTHON_EXECUTABLE
-    NAMES python python25 python24 python23
+    NAMES python python27 python26 python25 python24 python23
     NO_DEFAULT_PATH # Avoid searching non-standard locations first
     PATHS
     /bin
@@ -54,3 +54,4 @@ if (NOT PYTHON_EXECUTABLE)
 endif (NOT PYTHON_EXECUTABLE)
 
 mark_as_advanced(PYTHON_EXECUTABLE)
+
diff --git a/linden/indra/cmake/UnixInstall.cmake b/linden/indra/cmake/UnixInstall.cmake
index 0234dee..73f6714 100644
--- a/linden/indra/cmake/UnixInstall.cmake
+++ b/linden/indra/cmake/UnixInstall.cmake
@@ -21,11 +21,11 @@ if (INSTALL)
   set(INSTALL_SHARE_DIR ${INSTALL_PREFIX}/share CACHE PATH
       "Installation directory for read-only shared files.")
 
-  set(APP_BINARY_DIR ${INSTALL_LIBRARY_DIR}/imprudence-${viewer_VERSION}
+  set(APP_BINARY_DIR ${INSTALL_LIBRARY_DIR}/meta-impy-${viewer_VERSION}
       CACHE PATH
       "Installation directory for binaries.")
 
-  set(APP_SHARE_DIR ${INSTALL_SHARE_DIR}/imprudence-${viewer_VERSION}
+  set(APP_SHARE_DIR ${INSTALL_SHARE_DIR}/meta-impy-${viewer_VERSION}
       CACHE PATH
       "Installation directory for read-only data files.")
 endif (INSTALL)
diff --git a/linden/indra/cmake/Variables.cmake b/linden/indra/cmake/Variables.cmake
index eb9c004..65fe841 100644
--- a/linden/indra/cmake/Variables.cmake
+++ b/linden/indra/cmake/Variables.cmake
@@ -1,6 +1,6 @@
 # -*- cmake -*-
 #
-# Definitions of variables used throughout the Second Life build
+# Definitions of variables used throughout the build
 # process.
 #
 # Platform variables:
@@ -42,6 +42,7 @@ endif (EXISTS ${CMAKE_SOURCE_DIR}/Server.cmake)
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
   set(WINDOWS ON BOOL FORCE)
+  set(USE_OTR 0)
   set(ARCH i686)
   set(LL_ARCH ${ARCH}_win32)
   set(LL_ARCH_DIR ${ARCH}-win32)
@@ -73,14 +74,14 @@ endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 # Default deploy grid
 set(GRID agni CACHE STRING "Target Grid")
 
-set(VIEWER ON CACHE BOOL "Build Second Life viewer.")
-set(VIEWER_CHANNEL "Imprudence" CACHE STRING "Viewer Channel Name")
+set(VIEWER ON CACHE BOOL "Build the viewer.")
+set(VIEWER_CHANNEL "meta-impy" CACHE STRING "Viewer Channel Name")
 set(VIEWER_LOGIN_CHANNEL ${VIEWER_CHANNEL} CACHE STRING "Fake login channel for A/B Testing")
 
-set(STANDALONE OFF CACHE BOOL "Do not use Imprudence-supplied prebuilt libraries.")
+set(STANDALONE OFF CACHE BOOL "Do not use meta-impy-supplied prebuilt libraries.")
 
 if (NOT STANDALONE AND EXISTS ${CMAKE_SOURCE_DIR}/llphysics)
-    set(SERVER ON CACHE BOOL "Build Second Life server software.")
+    set(SERVER ON CACHE BOOL "Build the server software.")
 endif (NOT STANDALONE AND EXISTS ${CMAKE_SOURCE_DIR}/llphysics)
 
 if (LINUX AND SERVER AND VIEWER)
diff --git a/linden/indra/cmake/gpg.vs.cmake b/linden/indra/cmake/gpg.vs.cmake
new file mode 100644
index 0000000..a5220f4
--- /dev/null
+++ b/linden/indra/cmake/gpg.vs.cmake
@@ -0,0 +1,6 @@
+# -*- cmake -*-
+
+# gpg.vs is just a place to put windows specific nastyness needed to
+# make the libgcrypt, libgpg-error, and libotr compile.
+
+set(gpg.vs_INCLUDE_DIRS )
diff --git a/linden/indra/cmake/libgcrypt.cmake b/linden/indra/cmake/libgcrypt.cmake
new file mode 100644
index 0000000..0134618
--- /dev/null
+++ b/linden/indra/cmake/libgcrypt.cmake
@@ -0,0 +1,8 @@
+# -*- cmake -*-
+
+set(LIBGCRYPT_INCLUDE_DIRS
+    )
+
+set(LIBGCRYPT_LIBRARIES
+    libgcrypt
+    )
diff --git a/linden/indra/cmake/libgpg-error.cmake b/linden/indra/cmake/libgpg-error.cmake
new file mode 100644
index 0000000..71deeaa
--- /dev/null
+++ b/linden/indra/cmake/libgpg-error.cmake
@@ -0,0 +1,8 @@
+# -*- cmake -*-
+
+set(LIBGPG-ERROR_INCLUDE_DIRS
+    )
+
+set(LIBGPG-ERROR_LIBRARIES
+    libgpg-error
+    )
diff --git a/linden/indra/cmake/libotr.cmake b/linden/indra/cmake/libotr.cmake
new file mode 100644
index 0000000..3c07be2
--- /dev/null
+++ b/linden/indra/cmake/libotr.cmake
@@ -0,0 +1,8 @@
+# -*- cmake -*-
+
+set(LIBOTR_INCLUDE_DIRS
+    )
+
+set(LIBOTR_LIBRARIES
+    libotr
+    )
diff --git a/linden/indra/cmake/libotrb.cmake b/linden/indra/cmake/libotrb.cmake
new file mode 100644
index 0000000..eb8522f
--- /dev/null
+++ b/linden/indra/cmake/libotrb.cmake
@@ -0,0 +1,4 @@
+# -*- cmake -*-
+include(Prebuilt)
+
+set(OTR_LIBRARY otr)