--- a/ChangeLog	Thu Jun 05 16:50:44 2014 +0100
+++ b/ChangeLog	Wed Jun 11 01:12:11 2014 +0100
@@ -1,3 +1,19 @@
+2014-06-10  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	PR1371: Provide option to build without debugging
+	* INSTALL: Updated.
+	* Makefile.am:
+	(ICEDTEA_ENV): Only set DEBUG_CLASSFILES
+	and DEBUG_BINARIES when ENABLE_JAVA_DEBUGINFO
+	and ENABLE_NATIVE_DEBUGINFO are set, respectively.
+	* NEWS: Updated.
+	* acinclude.m4:
+	(IT_ENABLE_NATIVE_DEBUGINFO): New macro to add
+	option --enable-native-debuginfo.
+	(IT_ENABLE_JAVA_DEBUGINFO): New macro to add
+	option --enable-java-debuginfo.
+	* configure.ac: Invoke new macros.
+
 2014-06-02  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	PR1814: HotSpot URL should be used with --enable-hg

--- a/INSTALL	Thu Jun 05 16:50:44 2014 +0100
+++ b/INSTALL	Wed Jun 11 01:12:11 2014 +0100
@@ -204,6 +204,9 @@
   query it at runtime to obtain the cache location, rather than using a
   hardcoded value.
 * --enable-arm32-jit: Build the ARM32 JIT.
+* --enable-sunec: Build the SunEC crypto provider against system NSS.
+* --enable-native-debuginfo: Include debuginfo in native binaries.
+* --enable-java-debuginfo: Include debuginfo in Java class files.
 
 Testing
 =======

--- a/Makefile.am	Thu Jun 05 16:50:44 2014 +0100
+++ b/Makefile.am	Wed Jun 11 01:12:11 2014 +0100
@@ -478,8 +478,6 @@
 	DISTRIBUTION_ID="$(DIST_ID)" \
 	DERIVATIVE_ID="$(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV)" \
 	ALT_JIBX_LIBS_PATH="$(JIBX_DEPS_DIR)" \
-	DEBUG_CLASSFILES="true" \
-	DEBUG_BINARIES="true" \
 	ALT_OUTPUTDIR="$(BUILD_OUTPUT_DIR)" \
 	VERBOSE="$(VERBOSE)" \
 	STATIC_CXX="false" \
@@ -580,6 +578,16 @@
 	DISABLE_INTREE_EC="true"
 endif
 
+if ENABLE_NATIVE_DEBUGINFO
+ICEDTEA_ENV += \
+	DEBUG_BINARIES="true"
+endif
+
+if ENABLE_JAVA_DEBUGINFO
+ICEDTEA_ENV += \
+	DEBUG_CLASSFILES="true"
+endif
+
 # OpenJDK boot build environment.
 ICEDTEA_ENV_BOOT = $(ICEDTEA_ENV) \
 	BOOTCLASSPATH_CLS_RT="-bootclasspath $(CLS_DIR_BOOT):$(RUNTIME)" \

--- a/NEWS	Thu Jun 05 16:50:44 2014 +0100
+++ b/NEWS	Wed Jun 11 01:12:11 2014 +0100
@@ -279,6 +279,7 @@
   - PR1807: Support Debian/Ubuntu 7 OpenJDK Install as Boot JDK
   - PR1365: Replace hgforest support
   - PR1814: HotSpot URL should be used with --enable-hg
+  - PR1371: Provide option to build without debugging
 * PPC & AIX port
   - Add AIX-specific build instructions to README-ppc.html
   - Added AIX as testing platform for more jtreg tests written in shell-script

--- a/acinclude.m4	Thu Jun 05 16:50:44 2014 +0100
+++ b/acinclude.m4	Wed Jun 11 01:12:11 2014 +0100
@@ -2742,3 +2742,47 @@
   fi
   AC_SUBST(TOOLS_JAR)
 ])  
+
+AC_DEFUN_ONCE([IT_ENABLE_NATIVE_DEBUGINFO],
+[
+  AC_MSG_CHECKING([whether to build native code with debugging information])
+  AC_ARG_ENABLE([native-debuginfo],
+                [AS_HELP_STRING(--enable-native-debuginfo,build with native code debuginfo [[default=yes]])],
+  [
+    case "${enableval}" in
+      yes)
+        enable_native_debuginfo=yes
+        ;;
+      *)
+        enable_native_debuginfo=no
+        ;;
+    esac
+  ],
+  [
+    enable_native_debuginfo=yes
+  ])
+  AC_MSG_RESULT([$enable_native_debuginfo])
+  AM_CONDITIONAL([ENABLE_NATIVE_DEBUGINFO], test x"${enable_native_debuginfo}" = "xyes")
+])
+
+AC_DEFUN_ONCE([IT_ENABLE_JAVA_DEBUGINFO],
+[
+  AC_MSG_CHECKING([whether to build Java bytecode with debugging information])
+  AC_ARG_ENABLE([java-debuginfo],
+                [AS_HELP_STRING(--enable-java-debuginfo,build with Java bytecode debuginfo [[default=yes]])],
+  [
+    case "${enableval}" in
+      yes)
+        enable_java_debuginfo=yes
+        ;;
+      *)
+        enable_java_debuginfo=no
+        ;;
+    esac
+  ],
+  [
+    enable_java_debuginfo=yes
+  ])
+  AC_MSG_RESULT([$enable_java_debuginfo])
+  AM_CONDITIONAL([ENABLE_JAVA_DEBUGINFO], test x"${enable_java_debuginfo}" = "xyes")
+])

--- a/configure.ac	Thu Jun 05 16:50:44 2014 +0100
+++ b/configure.ac	Wed Jun 11 01:12:11 2014 +0100
@@ -51,6 +51,8 @@
 IT_DISABLE_LANGTOOLS_TESTS
 IT_DISABLE_JDK_TESTS
 IT_ENABLE_SUNEC
+IT_ENABLE_NATIVE_DEBUGINFO
+IT_ENABLE_JAVA_DEBUGINFO
 
 # Use xvfb-run if found to run gui tests (check-jdk).
 AC_CHECK_PROG(XVFB_RUN_CMD, xvfb-run, [xvfb-run -a -e xvfb-errors], [])