Fix up more prebuilt issues

indra/cmake/CURL.cmake

@@ -13,10 +13,8 @@ else (STANDALONE)
     debug libcurld
     optimized libcurl)
   else (WINDOWS)
-    set(CURL_LIBRARIES curl)
-    if(LINUX AND WORD_SIZE EQUAL 64)
-      list(APPEND CURL_LIBRARIES idn)
-    endif(LINUX AND WORD_SIZE EQUAL 64)
+    use_prebuilt_binary(libidn)
+    set(CURL_LIBRARIES curl idn)
   endif (WINDOWS)
   set(CURL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
 endif (STANDALONE)

indra/cmake/DBusGlib.cmake

@@ -7,12 +7,11 @@ if (STANDALONE)
   pkg_check_modules(DBUSGLIB REQUIRED dbus-glib-1)
 
 elseif (LINUX)
-  use_prebuilt_binary(dbusglib)
+  use_prebuilt_binary(dbus-glib)
   set(DBUSGLIB_FOUND ON FORCE BOOL)
   set(DBUSGLIB_INCLUDE_DIRS
-    ${LIBS_PREBUILT_DIR}/include/dbus
-    ${LIBS_PREBUILT_LEGACY_DIR}/include/dbus
-    )
+      ${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.
   set(DBUSGLIB_LIBRARIES