[Xen-changelog] Manual merge.

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 25e96ea6e4c5dd4a58be72a9b63b75380da524f1
# Parent  1a57305dd9e95a4c3d1c09df697cb771a0c54d16

# Parent  a28952e73253e2ae288ecd33bb85b1c6346186ff
Manual merge.

diff -r 1a57305dd9e9 -r 25e96ea6e4c5 .hgignore
--- a/.hgignore Sun Jul 10 17:28:06 2005
+++ b/.hgignore Sun Jul 10 17:32:01 2005
@@ -1,4 +1,6 @@
 .*\.a
+.*\.cmi
+.*\.cmo
 .*\.d
 .*\.o
 .*\.opic
@@ -93,6 +95,7 @@
 tools/check/\..*
 tools/cmdline/.*
 tools/cmdline/xen/.*
+tools/debugger/pdb/pdb
 tools/firmware/acpi/acpigen
 tools/firmware/.*\.bin
 tools/firmware/.*\.sym
diff -r 1a57305dd9e9 -r 25e96ea6e4c5 tools/check/check_curl_devel
--- /dev/null   Sun Jul 10 17:28:06 2005
+++ b/tools/check/check_curl_devel      Sun Jul 10 17:32:01 2005
@@ -0,0 +1,11 @@
+#!/bin/bash
+# CHECK-BUILD
+
+function error {
+    echo 'Check for libcurl includes failed.'
+    exit 1
+}
+
+set -e
+[ -e /usr/include/curl ] || error
+[ -e /usr/include/curl/curl.h ] || error
\ No newline at end of file
diff -r 1a57305dd9e9 -r 25e96ea6e4c5 tools/check/check_curl_lib
--- /dev/null   Sun Jul 10 17:28:06 2005
+++ b/tools/check/check_curl_lib        Sun Jul 10 17:32:01 2005
@@ -0,0 +1,10 @@
+#!/bin/bash
+# CHECK-BUILD CHECK-INSTALL
+
+function error {
+        echo 'Check for CURL library failed.'
+        exit 1
+}
+
+set -e
+ldconfig -p | grep libcurl.so || error
\ No newline at end of file

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog