Skip to content
Permalink
Browse files

start excommunication boost stuff

  • Loading branch information...
kosloot committed Aug 16, 2019
1 parent f196176 commit bb698e84aaeb3f5c0b3c59c9c411ef9f25d47da2
Showing with 18 additions and 18 deletions.
  1. +13 −13 .travis.yml
  2. +5 −5 configure.ac
@@ -35,21 +35,21 @@ matrix:

before_install:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
sudo apt-get update;
sudo apt-get install pkg-config autoconf-archive ccache cppcheck libicu-dev libxml2-dev libbz2-dev zlib1g-dev libtar-dev libboost-dev libboost-regex-dev;
sudo apt-get update;
sudo apt-get install pkg-config autoconf-archive ccache cppcheck libicu-dev libxml2-dev libbz2-dev zlib1g-dev libtar-dev;
fi

- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
brew update;
brew install pkg-config;
brew install autoconf-archive;
brew outdated || brew upgrade icu4c;
brew outdated || brew upgrade libxml2;
brew outdated || brew install bzip2;
brew outdated || brew install zlib;
brew install libtar;
brew install cppcheck;
brew install ccache;
brew outdated boost || brew upgrade boost;
brew update;
brew install pkg-config;
brew install autoconf-archive;
brew outdated || brew upgrade icu4c;
brew outdated || brew upgrade libxml2;
brew outdated || brew install bzip2;
brew outdated || brew install zlib;
brew install libtar;
brew install cppcheck;
brew install ccache;
fi

- export PATH="/usr/lib/ccache/bin/:$PATH"
@@ -75,11 +75,11 @@ fi
# for now we demand boost, because on some systems gcc4.8 is installed still
# and that fails on regex.

AX_BOOST_BASE( [1.50],
[AX_BOOST_REGEX
LIBS="$LIBS $BOOST_REGEX_LIB"
AC_DEFINE(HAVE_BOOST_REGEX, 1 , [Define to 1 if you have boost regular expresions] )],
[AC_MSG_ERROR([No Regular expression support available. Please install libboost-regex-dev])])
#AX_BOOST_BASE( [1.50],
# [AX_BOOST_REGEX
# LIBS="$LIBS $BOOST_REGEX_LIB"
# AC_DEFINE(HAVE_BOOST_REGEX, 1 , [Define to 1 if you have boost regular expresions] )],
# [AC_MSG_ERROR([No Regular expression support available. Please install libboost-regex-dev])])

PKG_PROG_PKG_CONFIG

0 comments on commit bb698e8

Please sign in to comment.
You can’t perform that action at this time.