From 7898c22a06cbae1fb9e8ab671905d000e0eea2da Mon Sep 17 00:00:00 2001
From: Darshit Shah <darnir@gmail.com>
Date: Thu, 3 Dec 2015 09:15:23 +0100
Subject: [PATCH 1/2] Fix Shebang line and other issues with autogen.sh

The shebang line was not being interpreted due to a space between # and !. On
fixing it, smaller issues came to the fore due to the effects of the -e switch.
Fixed them all.
---
 autogen.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 9de26f5..e714cf8 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,21 +1,21 @@
-# !/bin/sh -e
+#!/bin/sh -e
 
-AUTORECONF=`which autoreconf 2>/dev/null`
+AUTORECONF=$(which autoreconf 2>/dev/null || true)
 if test $? -ne 0; then
   echo "No 'autoreconf' found. You must install the autoconf package."
   exit 1
 fi
 
-GIT=`which git 2>/dev/null`
+GIT=$(which git 2>/dev/null || true)
 if test $? -ne 0; then
   echo "No 'git' found. You must install the git package."
   exit 1
 fi
 
 # create m4 before gtkdocize
-mkdir m4 2>/dev/null
+mkdir m4 2>/dev/null || true
 
-GTKDOCIZE=`which gtkdocize 2>/dev/null`
+GTKDOCIZE=$(which gtkdocize 2>/dev/null || true)
 if test $? -ne 0; then
   echo "No gtk-doc support found. You can't build the docs."
   # rm because gtk-doc.make might be a link to a protected file
@@ -29,7 +29,7 @@ fi
 
 $GIT submodule init
 $GIT submodule update
-$AUTORECONF --install --force --symlink || exit $?
+$AUTORECONF --install --force --symlink
 
 echo
 echo "----------------------------------------------------------------"

From df053f91cca36f47d4b994938dbf2bf4f84b6e8e Mon Sep 17 00:00:00 2001
From: Darshit Shah <darnir@gmail.com>
Date: Thu, 10 Dec 2015 23:16:37 +0100
Subject: [PATCH 2/2] Faster, more concurrent travis builds

---
 .travis.yml | 52 ++++++++++++++++++++++++++++++++--------------------
 1 file changed, 32 insertions(+), 20 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d72425b..3a0823c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,29 +1,41 @@
+sudo: false
+
 language: c
+
 compiler:
   - gcc
   - clang
-# Change this to your needs
+
+env:
+    - RUNTIME=libicu
+    - RUNTIME=libidn2
+    - RUNTIME=libidn
+    - RUNTIME=no
+
+addons:
+    apt:
+        packages:
+            - automake
+            - autoconf
+            - autopoint
+            - libtool
+            - gtk-doc-tools
+            - gettext
+            - libidn11
+            - libidn11-dev
+            - libidn2-0
+            - libidn2-0-dev
+            - libicu48
+            - libicu-dev
+            - libunistring0
+            - libunistring-dev
+
 script:
   - ./autogen.sh
   - ./configure && make -j4 && make check -j4
-  - ./configure --enable-runtime=libicu --enable-builtin=libicu && make clean && make -j4 && make check -j4
-  - ./configure --enable-runtime=libicu --enable-builtin=libidn2 && make clean && make -j4 && make check -j4
-  - ./configure --enable-runtime=libicu --enable-builtin=libidn && make clean && make -j4 && make check -j4
-  - ./configure --enable-runtime=libicu --disable-builtin && make clean && make -j4 && make check -j4
-  - ./configure --enable-runtime=libidn2 --enable-builtin=libicu && make clean && make -j4 && make check -j4
-  - ./configure --enable-runtime=libidn2 --enable-builtin=libidn2 && make clean && make -j4 && make check -j4
-  - ./configure --enable-runtime=libidn2 --enable-builtin=libidn && make clean && make -j4 && make check -j4
-  - ./configure --enable-runtime=libidn2 --disable-builtin && make clean && make -j4 && make check -j4
-  - ./configure --enable-runtime=libidn --enable-builtin=libicu && make clean && make -j4 && make check -j4
-  - ./configure --enable-runtime=libidn --enable-builtin=libidn2 && make clean && make -j4 && make check -j4
-  - ./configure --enable-runtime=libidn --enable-builtin=libidn && make clean && make -j4 && make check -j4
-  - ./configure --enable-runtime=libidn --disable-builtin && make clean && make -j4 && make check -j4
-  - ./configure --disable-runtime --enable-builtin=libicu && make clean && make -j4 && make check -j4
-  - ./configure --disable-runtime --enable-builtin=libidn2 && make clean && make -j4 && make check -j4
-  - ./configure --disable-runtime --enable-builtin=libidn && make clean && make -j4 && make check -j4
-  - ./configure --disable-runtime --disable-builtin && make clean && make -j4 && make check -j4
+  - ./configure --enable-runtime=$RUNTIME --enable-builtin=libicu && make clean && make -j4 && make check -j4
+  - ./configure --enable-runtime=$RUNTIME --enable-builtin=libidn2 && make clean && make -j4 && make check -j4
+  - ./configure --enable-runtime=$RUNTIME --enable-builtin=libidn && make clean && make -j4 && make check -j4
+  - ./configure --enable-runtime=$RUNTIME --disable-builtin && make clean && make -j4 && make check -j4
   - ./configure --enable-gtk-doc && make -j4 && make check -j4
   - make distcheck
-before_install:
-  - sudo apt-get -qq update
-  - sudo apt-get -q install autoconf automake autopoint libtool gtk-doc-tools gettext libidn11 libidn11-dev libidn2-0 libidn2-0-dev libicu48 libicu-dev libunistring0 libunistring-dev