# HG changeset patch
# User Andrew John Hughes <gnu_andrew@member.fsf.org>
# Date 1396030920 0
# Node ID c1f745660d2966598bacea7c1cc902ccd839e013
# Parent  fea149da671f27f9321a4cdcc31abedb45920edc
PR1726: configure fails looking for ecj.jar before even trying to find javac

2014-03-28  Andrew John Hughes  <gnu.andrew@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.
	* NEWS: Updated.

diff -r fea149da671f -r c1f745660d29 ChangeLog
--- a/ChangeLog	Fri Mar 28 18:21:00 2014 +0000
+++ b/ChangeLog	Fri Mar 28 18:22:00 2014 +0000
@@ -1,3 +1,12 @@
+2014-03-28  Andrew John Hughes  <gnu.andrew@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.
+	* NEWS: Updated.
+
 2014-03-28  Andrew John Hughes  <gnu.andrew@redhat.com>
 
 	* configure.ac: Bump to 2.3.15pre00.
diff -r fea149da671f -r c1f745660d29 NEWS
--- a/NEWS	Fri Mar 28 18:21:00 2014 +0000
+++ b/NEWS	Fri Mar 28 18:22:00 2014 +0000
@@ -12,6 +12,9 @@
 
 New in release 2.3.15 (20XX-XX-XX):
 
+* Bug fixes
+  - PR1726: configure fails looking for ecj.jar before even trying to find javac
+
 New in release 2.3.14 (2014-03-28):
 
 * Security fixes
diff -r fea149da671f -r c1f745660d29 acinclude.m4
--- a/acinclude.m4	Fri Mar 28 18:21:00 2014 +0000
+++ b/acinclude.m4	Fri Mar 28 18:22:00 2014 +0000
@@ -127,6 +127,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
@@ -343,11 +349,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)
 ])