diff --git a/autobuild.xml b/autobuild.xml index e060cc1bd6ceb7676069095bed993c2a3896866d..6dfa7671d33af5657578641665ebda34b836afb4 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -920,9 +920,9 @@ <key>archive</key> <map> <key>hash</key> - <string>7e6b2fc7ad4e12d94d01cc49c22c6f67</string> + <string>840cd9455638c0ea52c613cfddd07d5b</string> <key>url</key> - <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jsoncpp-svn-r69-linux-20101013.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-jsoncpp/rev/223959/arch/Linux/installer/jsoncpp-0.5.0-linux-20110315.tar.bz2</string> </map> <key>name</key> <string>linux</string> diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake index 9024fa92a7adad9d97a7dae67461c1ef663c6011..499b00fb444328bfc46f2b2493a7de4b3216744d 100644 --- a/indra/cmake/JsonCpp.cmake +++ b/indra/cmake/JsonCpp.cmake @@ -16,7 +16,7 @@ else (STANDALONE) elseif (DARWIN) set(JSONCPP_LIBRARIES libjson_linux-gcc-4.0.1_libmt.a) elseif (LINUX) - set(JSONCPP_LIBRARIES libjsoncpp.a) + set(JSONCPP_LIBRARIES libjson_linux-gcc-4.1.3_libmt.a) endif (WINDOWS) set(JSONCPP_INCLUDE_DIRS "${LIBS_PREBUILT_DIR}/include/jsoncpp" "${LIBS_PREBUILT_DIR}/include/json") endif (STANDALONE)