From 1228732432f1b686f28c8f49d9a6eb7ef8fe470f Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Sun, 8 Jul 2012 17:08:11 -0400
Subject: [PATCH] Fix for compile error caused by compiler type not being
 defined on DARWIN.

and stop compiling dsa/dhparam, we don't use these.
---
 indra/cmake/00-Common.cmake  | 8 ++------
 indra/newview/CMakeLists.txt | 4 ++--
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 58f8acf90..acf1ecafa 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -198,7 +198,6 @@ if (LINUX)
     # End of hacks.
 
     #GCC Specific
-    add_definitions(-DCC_GCC)
 
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
 
@@ -228,11 +227,6 @@ if (LINUX)
     find_program(CLANG clang++)
     mark_as_advanced(CLANG)
 
-    add_definitions(
-        -DCC_CLANG
-        -D_FORTIFY_SOURCE=2
-        )
-
     if (NOT STANDALONE)
       # this stops us requiring a really recent glibc at runtime
       add_definitions(-fno-stack-protector)
@@ -280,9 +274,11 @@ endif (DARWIN)
 
 if (LINUX OR DARWIN)
   if(${CMAKE_C_COMPILER} MATCHES "gcc*")
+    add_definitions(-DCC_GCC)
     set(UNIX_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs")
     set(UNIX_CXX_WARNINGS "${UNIX_WARNINGS} -Wno-reorder -Wno-non-virtual-dtor -Woverloaded-virtual")
   elseif(${CMAKE_C_COMPILER} MATCHES "clang*")
+    add_definitions(-DCC_CLANG -D_FORTIFY_SOURCE=2)
     set(UNIX_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs -Wno-tautological-compare -Wno-char-subscripts -Wno-gnu -Wno-logical-op-parentheses 
     -Wno-non-virtual-dtor -Woverloaded-virtual -Wno-parentheses-equality -Wno-reorder -Wno-unused-function -Wno-unused-value -Wno-unused-variable")
     set(UNIX_CXX_WARNINGS "${UNIX_WARNINGS}")
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 2e66f5f32..03e6d9b9e 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -98,8 +98,8 @@ set(viewer_SOURCE_FILES
     ascentprefschat.cpp
     ascentprefssys.cpp
     ascentprefsvan.cpp
-    dhparam.cpp
-    dsaparam.cpp
+	#dhparam.cpp
+	#dsaparam.cpp
     emeraldboobutils.cpp
     dofloaterhex.cpp
     dohexeditor.cpp