--- old/common/autoconf/jdk-options.m4	2015-11-17 12:28:50.714009166 +0900
+++ new/common/autoconf/jdk-options.m4	2015-11-17 12:28:50.598829223 +0900
@@ -624,8 +624,28 @@
     ZIP_DEBUGINFO_FILES=true
   fi
 
+  #
+  # DEBUG_SYMBOLS
+  #
+  AC_MSG_CHECKING([what type of debug symbols to use])
+  DEBUG_SYMBOLS="zipped"
+  AC_ARG_WITH([debug-symbols], [AS_HELP_STRING([--with-debug-symbols],
+      [set the debug symbol configuration (none, internal, external, zipped) @<:@zipped@:>@])],
+      [
+        DEBUG_SYMBOLS="${withval}"
+      ])
+  AC_MSG_RESULT([$DEBUG_SYMBOLS])
+
+  if test "x$DEBUG_SYMBOLS" != xzipped && \
+      test "x$DEBUG_SYMBOLS" != xnone && \
+      test "x$DEBUG_SYMBOLS" != xinternal && \
+      test "x$DEBUG_SYMBOLS" != xexternal; then
+    AC_MSG_ERROR([Allowed debug symbols are: none, internal, external, zipped])
+  fi
+
   AC_SUBST(ENABLE_DEBUG_SYMBOLS)
   AC_SUBST(ZIP_DEBUGINFO_FILES)
+  AC_SUBST(DEBUG_SYMBOLS)
 ])
 
 ################################################################################