travis: allow_failures

[m6w6/ext-http] / travis / brotli.sh

diff --git a/travis/brotli.sh b/travis/brotli.sh
index 1a9f6cd93670fcd08457f73bdae5907e60a1ed7a..d23dd19b87a4d9061ccbd22d8a7b08e45d613216 100755 (executable)
--- a/travis/brotli.sh
+++ b/travis/brotli.sh
@@ -1,9 +1,19 @@
 #!/bin/bash
 
-git clone https://github.com/google/brotli.git
-cd brotli
-git checkout v1.0.2
-./bootstrap
-./configure --prefix=/home/travis/brotli
-make -j2
-make install
+BROTLI_DIR="$with_http_libbrotli_dir"
+BROTLI_SRC="$BROTLI_DIR.git"
+
+if test -n "$BROTLI_DIR" && test "$BROTLI_DIR" != "no"; then
+       if test -d "$BROTLI_SRC"; then
+               cd "$BROTLI_SRC"
+               git pull
+       else
+               git clone https://github.com/google/brotli.git "$BROTLI_SRC"
+               cd "$BROTLI_SRC"
+       fi
+       git checkout $1
+       ./bootstrap
+       ./configure -C --prefix="$BROTLI_DIR"
+       make -j ${JOBS:2}
+       make install INSTALL=install
+fi