/hg/release/icedtea7-2.4: 2 new changesets

[andrew at icedtea.classpath.org]

changeset 46f9059509fe in /hg/release/icedtea7-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=46f9059509fe
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Mar 28 18:06:31 2014 +0000

	Start 2.4.7 release cycle.

	2014-03-28  Andrew John Hughes  <gnu.andrew at redhat.com>

		* configure.ac: Bump to 2.4.7pre00.
		* NEWS: Add 2.4.7 section.


changeset e8e59c50a451 in /hg/release/icedtea7-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=e8e59c50a451
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Mar 28 18:12:46 2014 +0000

	PR1726: configure fails looking for ecj.jar before even trying to find javac

	2014-03-28  Andrew John Hughes  <gnu.andrew at redhat.com>

		* acinclude.m4:
		(IT_FIND_COMPILER): Check value of ECJ_JAR
		and JAVAC here ...
		(IT_FIND_ECJ_JAR): ... rather than here where
		${JAVAC} may not yet be defined.


diffstat:

 ChangeLog    |  13 +++++++++++++
 NEWS         |   5 +++++
 acinclude.m4 |  11 ++++++-----
 configure.ac |   2 +-
 4 files changed, 25 insertions(+), 6 deletions(-)

diffs (72 lines):

diff -r d2bc83a8ce09 -r e8e59c50a451 ChangeLog
--- a/ChangeLog	Fri Mar 28 12:27:42 2014 +0000
+++ b/ChangeLog	Fri Mar 28 18:12:46 2014 +0000
@@ -1,3 +1,16 @@
+2014-03-28  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* acinclude.m4:
+	(IT_FIND_COMPILER): Check value of ECJ_JAR
+	and JAVAC here ...
+	(IT_FIND_ECJ_JAR): ... rather than here where
+	${JAVAC} may not yet be defined.
+
+2014-03-28  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* configure.ac: Bump to 2.4.7pre00.
+	* NEWS: Add 2.4.7 section.
+
 2014-03-26  Andrew John Hughes  <gnu.andrew at member.fsf.org>
 
 	* NEWS: Update with recent changes.
diff -r d2bc83a8ce09 -r e8e59c50a451 NEWS
--- a/NEWS	Fri Mar 28 12:27:42 2014 +0000
+++ b/NEWS	Fri Mar 28 18:12:46 2014 +0000
@@ -12,6 +12,11 @@
 
 CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
 
+New in release 2.4.7 (2014-04-XX):
+
+* Bug fixes
+  - PR1726: configure fails looking for ecj.jar before even trying to find javac
+
 New in release 2.4.6 (2014-03-28):
 
 * Backports
diff -r d2bc83a8ce09 -r e8e59c50a451 acinclude.m4
--- a/acinclude.m4	Fri Mar 28 12:27:42 2014 +0000
+++ b/acinclude.m4	Fri Mar 28 18:12:46 2014 +0000
@@ -134,6 +134,12 @@
   IT_USING_ECJ
   IT_WITH_GCJ
   
+  if test "x${ECJ_JAR}" = "xno"; then
+    if test "x${JAVAC}" = "x"; then
+      AC_MSG_ERROR("No compiler or ecj JAR file was found.")
+    fi
+  fi
+
   if test x"${GCJ}" != xno ; then
     JAVAC="${JAVA} -classpath ${ECJ_JAR} org.eclipse.jdt.internal.compiler.batch.Main"
   fi
@@ -350,11 +356,6 @@
       fi
   fi
   AC_MSG_RESULT(${ECJ_JAR})
-  if test "x${ECJ_JAR}" = "xno"; then
-    if test "x${JAVAC}" = "x"; then
-      AC_MSG_ERROR("No compiler or ecj JAR file was found.")
-    fi
-  fi
   AC_SUBST(ECJ_JAR)
 ])
 
diff -r d2bc83a8ce09 -r e8e59c50a451 configure.ac
--- a/configure.ac	Fri Mar 28 12:27:42 2014 +0000
+++ b/configure.ac	Fri Mar 28 18:12:46 2014 +0000
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.4.6], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea], [2.4.7pre00], [distro-pkg-dev at openjdk.java.net])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AC_CONFIG_FILES([Makefile])