Merge fec4910 into c3b7f48

.gitignore

@@ -1,18 +1,29 @@
 *~
 Makefile
+Makefile.in
 CMakeFiles
 CMakeCache.txt
 CTestTestfile.cmake
 cmake_install.cmake
 
 /*.manifest
 /*.swp
+/aclocal.m4
 /autom4te.cache
+/config.cache
+/config.guess
 /config.log
 /config.status
-/config.cache
-/proj.pc
+/config.sub
+/configure
+/compile
+/depcomp
+/install-sh
+/libtool
+/ltmain.sh
+/missing
 /nbproject
+/proj.pc
 /bin
 /lib
 /DartConfiguration.tcl
@@ -22,7 +33,15 @@ cmake_install.cmake
 /html/dl
 /html/robots.txt
 
+# m4
+/m4/libtool.m4
+/m4/ltoptions.m4
+/m4/ltsugar.m4
+/m4/ltversion.m4
+/m4/lt~obsolete.m4
+
 # nad
+/nad/install
 /nad/WI
 /nad/prvi
 /nad/WO
@@ -60,6 +79,7 @@ cmake_install.cmake
 /src/geod
 /src/stamp-h*
 /src/proj_config.h
+/src/proj_config.h.in
 /src/cs2cs
 /src/multistresstest
 /src/test228

.travis.yml

@@ -11,6 +11,8 @@ before_install:
  - sudo pip install git+git://github.com/tbonfort/cpp-coveralls.git@extensions
 
 install:
+# prepare build files
+  - ./autogen.sh
 # cmake build
   - mkdir build_cmake
   - cd build_cmake