Fix Travis-CI build

While here, refactor a bit so that a failing libnfc build does not
indicate a failure of the libfreefare build.

.travis-ci-build

@@ -1,9 +1,6 @@
 #!/bin/sh
-
-build_install()
-{
-	(
 cd $1
+
 if [ "$BLD" = autotools ]; then
 	set -x
 	autoreconf -vis
@@ -12,7 +9,6 @@ build_install()
 	../configure --prefix=$HOME/.local
 	make
 	make install
-			set +x
 elif [ "$BLD" = cmake ]; then
 	set -x
 	mkdir build-cmake
@@ -20,14 +16,7 @@ build_install()
 	cmake -DCMAKE_INSTALL_PREFIX=$HOME/.local ..
 	make
 	make install
-			set +x
 else
 	echo "Unsupported build system: '$BLD'" >&2
 	exit 1
 fi
-	)
-}
-
-git clone https://github.com/nfc-tools/libnfc
-build_install libnfc
-build_install .

.travis.yml

@@ -6,7 +6,7 @@ compiler:
 
 env:
   - BLD=cmake
-  - BLD=autoconf
+  - BLD=autotools
 
 addons:
   apt:
@@ -15,4 +15,7 @@ addons:
       - cmake
       - libcutter-dev
 
-script: ./.travis-ci-build
+install:
+  - git clone https://github.com/nfc-tools/libnfc
+  - ./.travis-ci-build libnfc
+script: ./.travis-ci-build .