diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..94f4a22 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,62 @@ +language: cpp + +# Use container-based infrastructure +sudo: false + +os: + - linux + - osx + +compiler: + - gcc + - clang + +matrix: + allow_failures: + # we exceed the time limit + - os: osx + fast_finish: true + +cache: + # Enable compiler cache + ccache: true + # Caching Ubuntu packages + apt: true + # Caching other directories + directories: + - ${DEPENDENCIES_INSTALL} + +addons: + apt: + sources: ['kalakris-cmake'] + packages: + - autotools-dev + - automake + - cmake + - libxerces-c-dev + - openssl + +before_install: + - env | sort + - date -u + - uname -a + - if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then + lsb_release -a; + ccache -s; + elif [[ ${TRAVIS_OS_NAME} == "osx" ]]; then + sw_vers -productVersion; + fi + +script: + - if [[ ${TRAVIS_OS_NAME} == "osx" ]]; then + export CPPFLAGS="-I$(brew --prefix openssl)/include"; + export LDFLAGS="-lcrypto -L$(brew --prefix openssl)/lib"; + fi + - ./configure --build=x86_64 --enable-phdr --enable-as-02 --enable-dev-headers + - make + +# Before uploading the new cache archive +before_cache: + - if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then + ccache -s; + fi diff --git a/aclocal.m4 b/aclocal.m4 index c41e4a2..125d68a 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.]) # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.13' +[am__api_version='1.14' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.13.4], [], +m4_if([$1], [1.14.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.13.4])dnl +[AM_AUTOMAKE_VERSION([1.14.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) diff --git a/configure b/configure index d5f7533..768cefa 100755 --- a/configure +++ b/configure @@ -2347,7 +2347,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. #AC_CONFIG_HEADER([src/config.h]) -am__api_version='1.13' +am__api_version='1.14' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or