From eae5157466e8fd2eb6508c5b5f34aa1d5fe373ea Mon Sep 17 00:00:00 2001
From: Jerry Jacobs <jerry.jacobs@dualinventive.com>
Date: Mon, 2 May 2016 17:01:53 +0200
Subject: [PATCH] TravisCI: Add building with autotools, catches bugs early as
 seen by issue #403

---
 .travis.sh  | 14 ++++++++++----
 .travis.yml | 12 ++++++++++++
 README      | 15 +++++++--------
 3 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/.travis.sh b/.travis.sh
index cefeed1..6b69c63 100755
--- a/.travis.sh
+++ b/.travis.sh
@@ -6,7 +6,13 @@ else
 	brew install libusb
 fi
 
-mkdir build
-cd build
-cmake ..
-make
+if [ "$BUILD_SYSTEM" == "cmake" ]; then
+	mkdir build
+	cd build
+	cmake ..
+	make
+else
+	./autogen.sh
+	./configure
+	make
+fi
diff --git a/.travis.yml b/.travis.yml
index b175bb6..5164d36 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,19 @@ matrix:
   include:
     - os: osx
       compiler: clang
+      env: "BUILD_SYSTEM=cmake"
+    - os: osx
+      compiler: clang
+      env: "BUILD_SYSTEM=autotools"
     - os: linux
       compiler: gcc
+      env: "BUILD_SYSTEM=cmake"
     - os: linux
       compiler: clang
+      env: "BUILD_SYSTEM=cmake"
+    - os: linux
+      compiler: gcc
+      env: "BUILD_SYSTEM=autotools"
+    - os: linux
+      compiler: clang
+      env: "BUILD_SYSTEM=autotools"
diff --git a/README b/README
index b6a6de1..da7fafa 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 Open source version of the STMicroelectronics Stlink Tools
 ==========================================================
 
-[![Build Status](https://travis-ci.org/texane/stlink.svg?branch=travis)](https://travis-ci.org/texane/stlink)
+[![Build Status](https://travis-ci.org/texane/stlink.svg?branch=master)](https://travis-ci.org/texane/stlink)
 
 ## HOWTO
 
@@ -19,9 +19,8 @@ Two different transport layers are used:
 
 ## Common requirements
 
-. libusb-1.0  (You probably already have this, but you'll need the
-development version to compile)
-. pkg-config
+* `pkg-config`
+* `libusb-1.0` (plus development headers for building, on debian based distros `libusb-1.0.0-dev` package)
 
 ## For STLINKv1
 
@@ -31,10 +30,10 @@ is tell your operating system to completely ignore it.
 Options (do one of these before you plug it in)
 
 * `modprobe -r usb-storage && modprobe usb-storage quirks=483:3744:i`
-* or *)1. add "options usb-storage quirks=483:3744:i" to /etc/modprobe.conf
-*   *)2. modprobe -r usb-storage && modprobe usb-storage
-* or *)1. cp stlink_v1.modprobe.conf /etc/modprobe.d
-*   *)2. modprobe -r usb-storage && modprobe usb-storage
+* or 1. `echo "options usb-storage quirks=483:3744:i" >> /etc/modprobe.conf`
+*    2. `modprobe -r usb-storage && modprobe usb-storage`
+* or 1. `cp stlink_v1.modprobe.conf /etc/modprobe.d`
+*    2. `modprobe -r usb-storage && modprobe usb-storage`
 
 ## For STLINKv2