Some changes to help linux64.

* Don't build with libELFIO (lib not working).

* Use shared libpng12 instead of static library
  (fixes mozlib incompat for users with system libpng14).

2 files changed, 30 insertions, 13 deletions

diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
index 355ce45..fdfd587 100644
--- a/linden/indra/cmake/00-Common.cmake
+++ b/linden/indra/cmake/00-Common.cmake
@@ -212,15 +212,28 @@ if (STANDALONE)
     add_definitions(-march=pentiumpro)
   endif (LINUX AND ${ARCH} STREQUAL "i686")
 
-else (STANDALONE)
-  set(${ARCH}_linux_INCLUDES
-      ELFIO
-      atk-1.0
-      glib-2.0
-      gstreamer-0.10
-      gtk-2.0
-      pango-1.0
-      )
+else (STANDALONE)    
+  if (${ARCH} STREQUAL "i686")
+    set(${ARCH}_linux_INCLUDES
+        ELFIO
+        atk-1.0
+        glib-2.0
+        gstreamer-0.10
+        gtk-2.0
+        pango-1.0
+        )
+   else(${ARCH} STREQUAL "i686")
+     if (${ARCH} STREQUAL "x86_64")
+       set(${ARCH}_linux_INCLUDES
+          atk-1.0
+          glib-2.0
+          gstreamer-0.10
+          gtk-2.0
+          pango-1.0
+          )
+     endif (${ARCH} STREQUAL "x86_64")
+   endif (${ARCH} STREQUAL "i686")
+
 endif (STANDALONE)
 
 if(SERVER)
diff --git a/linden/indra/cmake/ELFIO.cmake b/linden/indra/cmake/ELFIO.cmake
index e51993b..4f19ecd 100644
--- a/linden/indra/cmake/ELFIO.cmake
+++ b/linden/indra/cmake/ELFIO.cmake
@@ -6,10 +6,14 @@ set(ELFIO_FIND_QUIETLY ON)
 if (STANDALONE)
   include(FindELFIO)
 elseif (LINUX)
-  use_prebuilt_binary(elfio)
-  set(ELFIO_LIBRARIES ELFIO)
-  set(ELFIO_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
-  set(ELFIO_FOUND "YES")
+     if (${ARCH} STREQUAL "x86_64")
+        set(ELFIO_FOUND "NO")
+     else (${ARCH} STREQUAL "x86_64")
+        use_prebuilt_binary(elfio)
+        set(ELFIO_LIBRARIES ELFIO)
+        set(ELFIO_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
+        set(ELFIO_FOUND "YES")
+     endif (${ARCH} STREQUAL "x86_64")
 endif (STANDALONE)
 
 if (ELFIO_FOUND)