X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=vpp-api%2Fjava%2Fconfigure.ac;h=797d8c4ab6119255c2d6f50c0c48c2274f2f2aae;hb=aa6920e0a80d8271be1dda59f613a1d2b0e1d3e6;hp=02f2570275db57ef874a817f26749209a8a57dfb;hpb=6b1d7c55d694fc6c0a262d6e1279fe207164e1b5;p=vpp.git diff --git a/vpp-api/java/configure.ac b/vpp-api/java/configure.ac index 02f2570275d..797d8c4ab61 100644 --- a/vpp-api/java/configure.ac +++ b/vpp-api/java/configure.ac @@ -1,4 +1,4 @@ -AC_INIT(vpp-japi, 1.0.0) +AC_INIT(vpp-japi, 16.09) LT_INIT AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE @@ -8,12 +8,19 @@ AM_PROG_AS AC_PROG_CC AM_PROG_CC_C_O +if test -f /usr/bin/lsb_release && test `lsb_release -si` == "Ubuntu" && test `lsb_release -sr` == "14.04" && test -d /usr/lib/jvm/java-8-openjdk-amd64/ ; then + JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/ + JAVAC=${JAVA_HOME}/bin/javac + PATH=${JAVA_HOME}/bin/:${PATH} + break +fi + +AX_CHECK_JAVA_HOME AX_PROG_JAVAC AX_PROG_JAVAH AX_PROG_JAR AX_PROG_JAVADOC AX_PROG_JAVA -AX_CHECK_JAVA_HOME AC_OUTPUT([Makefile])