auto merge of #1796 : kmcallister/servo/linux-fontconfig, r=jdm

Fixes #1790

r? @jdm
This commit is contained in:
bors-servo 2014-03-03 14:01:35 -05:00
commit 9743482dd1

1
configure vendored
View file

@ -686,6 +686,7 @@ do
CONFIGURE_SCRIPT="${CFG_SRC_DIR}src/${i}/autogen.sh"
CONFIGURE_ARGS="${CONFIGURE_ARGS} --sysconfdir=/etc"
CONFIGURE_ARGS="${CONFIGURE_ARGS} --localstatedir=/var"
CONFIGURE_ARGS="${CONFIGURE_ARGS} --disable-docs"
CONFIGURE_ARGS="${CONFIGURE_ARGS} --disable-shared" # work around Rust #12557
if [ -f /etc/redhat-release ]; then
# Some RedHat-based distros (including our CentOS 6 build machines) are missing