# HG changeset patch
# User ehelin
# Date 1518423161 -3600
# Node ID b3a833c9c6e981b67be6e2640d7ab85243870d0d
# Parent  09e128cfff3ea988ef608a7a4cfb330d19e3fb5b
8193189: Allow --boot-jdk to accept a .tar.gz compressed JDK image
Reviewed-by: ihse, erikj

diff -r 09e128cfff3e -r b3a833c9c6e9 make/autoconf/boot-jdk.m4
--- a/make/autoconf/boot-jdk.m4	Sun Feb 11 12:41:56 2018 +0100
+++ b/make/autoconf/boot-jdk.m4	Mon Feb 12 09:12:41 2018 +0100
@@ -102,8 +102,33 @@
 AC_DEFUN([BOOTJDK_CHECK_ARGUMENTS],
 [
   if test "x$with_boot_jdk" != x; then
-    BOOT_JDK=$with_boot_jdk
-    BOOT_JDK_FOUND=maybe
+    if test -d "$with_boot_jdk"; then
+      BOOT_JDK=$with_boot_jdk
+      BOOT_JDK_FOUND=maybe
+    elif test -f "$with_boot_jdk"; then
+      case "$with_boot_jdk" in
+        *.tar.gz )
+            BOOT_JDK_SUPPORT_DIR=$CONFIGURESUPPORT_OUTPUTDIR/boot-jdk
+            $RM -rf $BOOT_JDK_SUPPORT_DIR
+            $MKDIR -p $BOOT_JDK_SUPPORT_DIR
+            $GUNZIP -c $with_boot_jdk | $TAR xf - -C $BOOT_JDK_SUPPORT_DIR
+
+            # Try to find javac to determine BOOT_JDK path
+            BOOT_JDK_JAVAC_PATH=`$FIND $BOOT_JDK_SUPPORT_DIR | $GREP "/bin/javac"`
+            if test "x$BOOT_JDK_JAVAC_PATH" != x; then
+              BOOT_JDK_FOUND=maybe
+              BOOT_JDK=$($DIRNAME $($DIRNAME $BOOT_JDK_JAVAC_PATH))
+            else
+              BOOT_JDK_FOUND=no
+            fi
+          ;;
+        * )
+            BOOT_JDK_FOUND=no
+          ;;
+      esac
+    else
+      BOOT_JDK_FOUND=no
+    fi
     AC_MSG_NOTICE([Found potential Boot JDK using configure arguments])
   fi
 ])