auto merge of #1043 : kmcallister/servo/misc, r=larsbergstrom

CONTRIBUTING.md

@@ -0,0 +1,42 @@
+# Contributing to Servo
+
+Servo welcomes contribution from everyone. Here are the guidelines if you are
+thinking of helping us:
+
+
+## Contributions
+
+Contributions to Servo or its dependencies should be made in the form of GitHub
+pull requests. Each pull request will be reviewed by a core contributor
+(someone with permission to land patches) and either landed in the main tree or
+given feedback for changes that would be required. All contributions should
+follow this format, even those from core contributors.
+
+
+## Pull Request Checklist
+
+- Branch from the master branch and, if needed, rebase to the current master
+  branch before submitting your pull request. If it doesn't merge cleanly with
+  master you may be asked to rebase your changes.
+
+- Don't put submodule updates in your pull request unless they are to landed
+  commits.
+
+- If your patch is not getting reviewed or you need a specific person to review
+  it, you can @-reply a reviewer asking for a review in the pull request or a
+  comment, or you can ask for a review in `#servo` on `irc.mozilla.org`.
+
+- When changing code related to the DOM, add a test to `src/test/html/content`,
+  either by adding it to an existing test file or creating a new one.
+
+
+## Conduct
+
+We follow the [Rust Code of Conduct](https://github.com/mozilla/rust/wiki/Note-development-policy#conduct).
+
+
+## Communication
+
+Servo contributors frequent the `#servo` channel on [`irc.mozilla.org`](https://wiki.mozilla.org/IRC).
+
+You can also join the [`dev-servo` mailing list](https://lists.mozilla.org/listinfo/dev-servo).

README.md

@@ -3,6 +3,9 @@ The Servo Parallel Browser Project
 Servo is a prototype web browser engine written in the [Rust](https://github.com/mozilla/rust)
 language. It is currently developed on 64bit OS X and 64bit Linux.
 
+Servo welcomes contribution from everyone.  See
+[`CONTRIBUTING.md`](CONTRIBUTING.md) for help getting started.
+
 ## Prerequisites
 
 On OS X (homebrew):

configure

@@ -258,6 +258,16 @@ cpu_type() {
     esac
 }
 
+if [ -f configure -a -f Makefile.in ]; then
+    msg "You seem to be running configure within the source tree root."
+    msg "This is not supported.  Instead, make a build directory:"
+    msg ""
+    msg "    mkdir -p build && cd build && ../configure"
+    msg ""
+    msg "See README.md for more information."
+    exit 1
+fi
+
 msg "looking for configure programs"
 need_cmd cmp
 need_cmd mkdir

mk/sub.mk

@@ -105,6 +105,10 @@ DEPS_libcss += \
 	libparserutils \
 	$(NULL)
 
+DEPS_rust-png += \
+	libpng \
+	$(NULL)
+
 # Platform-specific dependencies
 ifeq ($(CFG_OSTYPE),apple-darwin)
 DEPS_rust-azure += \