diff options
| -rwxr-xr-x | travis/install.sh | 6 | ||||
| -rwxr-xr-x | travis/linux_gcc/before_install.sh | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/travis/install.sh b/travis/install.sh index 6931986c..14fe21e2 100755 --- a/travis/install.sh +++ b/travis/install.sh @@ -22,7 +22,11 @@ cd $TAR_DIRECTORY # autoconf build from generated tarball mkdir build_autoconf cd build_autoconf -../configure --prefix=/tmp/proj_autoconf_install_from_dist_all +if [ -f /usr/lib/jvm/java-7-openjdk-amd64/include/jni.h ]; then + CXXFLAGS="-I/usr/lib/jvm/java-7-openjdk-amd64/include -I/usr/lib/jvm/java-7-openjdk-amd64/include/linux" ../configure --prefix=/tmp/proj_autoconf_install_from_dist_all --with-jni +else + ../configure --prefix=/tmp/proj_autoconf_install_from_dist_all +fi make -j3 make check make install diff --git a/travis/linux_gcc/before_install.sh b/travis/linux_gcc/before_install.sh index 06213515..4ac7c3b6 100755 --- a/travis/linux_gcc/before_install.sh +++ b/travis/linux_gcc/before_install.sh @@ -9,6 +9,7 @@ sudo apt-get install -y cppcheck sudo apt-get install -qq lcov sudo apt-get install -qq doxygen graphviz sudo apt-get install -qq sqlite3 libsqlite3-dev +sudo apt-get install -qq openjdk-7-jdk scripts/cppcheck.sh scripts/doxygen.sh |