bond: Add bonding driver and LACP protocol

[vpp.git] / src / m4 / ax_vpp_find_jdk8.m4

diff --git a/src/m4/ax_vpp_find_jdk8.m4 b/src/m4/ax_vpp_find_jdk8.m4
index 2945982..94b7850 100644 (file)
--- a/src/m4/ax_vpp_find_jdk8.m4
+++ b/src/m4/ax_vpp_find_jdk8.m4
@@ -4,9 +4,23 @@ AC_DEFUN([AX_VPP_FIND_JDK8],
 [
 while true
 do
-  test "${JAVA_HOME+set}" = set && break
+  if test "${JAVA_HOME+set}" = set ; then
+    AC_MSG_CHECKING([${JAVA_HOME} for Java 8 compiler])
+    JAVAC=${JAVA_HOME}/bin/javac
+    JAVAH=${JAVA_HOME}/bin/javah
+    JAR=${JAVA_HOME}/bin/jar
+    JAVA_VERSION=$(${JAVA_HOME}/bin/javac -source 8 -version 2>&1)
+    if test 0 -eq "$?"; then
+      JAVA_VERSION=$(echo "${JAVA_VERSION}" | cut -d\  -f2)
+      AC_MSG_RESULT([ok])
+    else
+      AC_MSG_RESULT([no])
+      AC_MSG_ERROR([Java in ${JAVA_HOME} (path specified in JAVA_HOME) cannot compile Java 8 code])
+    fi
+    break
+  fi
 
-  for dir in $(find /usr/lib/jvm/* -maxdepth 0 -type d); do
+  for dir in $(find /usr/lib*/jvm/* -maxdepth 0 -type d); do
     AC_MSG_CHECKING([${dir} for Java 8 compiler])
     JAVA_VERSION=$(${dir}/bin/javac -source 8 -version 2>&1)
     if test 0 -eq "$?"; then