Change travis config to test both cmake and autoconf

Add Joshua Boyd to AUTHORS file.

diff --git a/.travis.yml b/.travis.yml
index f69c34833fdcdb4b3920a0e85699d3352ad20d22..6129bdf92ae45d926316e2b20bc07896edf5be0d 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,14 +7,21 @@ os:
 compiler:
   - gcc
   - clang
-  
+
+env:
+  - USE_CMAKE=YES
+  - USE_CMAKE=NO
+
 addons:
   apt:
     packages:
       - texinfo
 
 script:
-  - autoreconf -i
-  - ./configure
+  - mkdir build
+  - cd build
+  - if [ $USE_CMAKE == "YES" ] ; then cmake ../ ; fi
+  - if [ $USE_CMAKE == "NO" ] ; then pushd ../ ; autoreconf -i ; popd; fi
+  - if [ $USE_CMAKE == "NO" ] ; then ../configure ; fi
   - make
   - make check

diff --git a/AUTHORS b/AUTHORS
index c756d36bc18d86c7c7391118af8f6e75ed7154fe..6e8115b79f08363078f4bf337630a5b148d63f5c 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -13,12 +13,13 @@ Committers:
     Zdenek Crha           (new Check API docs, fixes, and tests)     |  zdenekc
     Mateusz Loskot        (msvc port #2)                             |  mloskot
     Jose E. Marchesi      (selective testing support)                |  jemarch
-    
+
 Contributors:
     Cesar Ballardini      (signals)
     Anthony G. Basile     (fix configure.ac and strsignal())
     Friedrich Beckmann    (mingw and msvc port #1)
     Frank Bergmann        (WIN32 tmpfile workaround)
+    Joshua Boyd           (travis testing with both build systems, cmake fixes)
     Ross Burton           (pkg-config patch)
     Bogdan Cristea        (eclipse support in contrib dir)
     Lucas Di Pentima      (signals)