From 4a8e5d9df9c21884d172741d3a5aec7d94f3914f Mon Sep 17 00:00:00 2001
From: Andrew de Laix <alain@lindenlab.com>
Date: Thu, 10 Mar 2011 21:51:13 +0000
Subject: [PATCH] update dbusglib archive for linux.
---
autobuild.xml | 6 +++---
indra/cmake/DBusGlib.cmake | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index df0e8047e44..d5ee7806292 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -320,7 +320,7 @@
<key>license</key>
<string>AFL2.1</string>
<key>license_file</key>
- <string>LICENSES/dbusglib.txt</string>
+ <string>LICENSES/dbus-glib.txt</string>
<key>name</key>
<string>dbusglib</string>
<key>platforms</key>
@@ -330,9 +330,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>bb9734fb6ae797e3fa34af1a4ef1ee7d</string>
+ <string>94b058b9a81114dc4567bd78e4335425</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/dbusglib-linux-20101013.tar.bz2</string>
+ <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/dbus_glib-0.76-linux-20110310.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
diff --git a/indra/cmake/DBusGlib.cmake b/indra/cmake/DBusGlib.cmake
index 33c6343a934..83c08d33509 100644
--- a/indra/cmake/DBusGlib.cmake
+++ b/indra/cmake/DBusGlib.cmake
@@ -10,7 +10,7 @@ elseif (LINUX)
use_prebuilt_binary(dbusglib)
set(DBUSGLIB_FOUND ON FORCE BOOL)
set(DBUSGLIB_INCLUDE_DIRS
- ${LIBS_PREBUILT_DIR}/include/glib-2.0
+ ${LIBS_PREBUILT_DIR}/include/dbus
)
# We don't need to explicitly link against dbus-glib itself, because
# the viewer probes for the system's copy at runtime.
--
GitLab