----- Forwarded message from  -----

To: classpath-patches@gnu.org
Subject: FYI: Support 1.5 test that doesn't rely on a 1.5 class library

This patch alters the 1.5 test in configure so that it
doesn't rely on the class library using generics (it previously
tested for a java.util.List<T>, now it just checks for enum
support).  This closes PR34579.

2008-01-03  Andrew John Hughes  <[EMAIL PROTECTED]>

        PR classpath/34578:
        * m4/acinclude.m4:
        (CLASSPATH_CHECK_JAVAC): Don't rely on 1.5 class
        library.
        
-- 
Andrew :-)

Escape the Java Trap with GNU Classpath!
http://www.gnu.org/philosophy/java-trap.html
public class gcj extends Freedom implements Java { ... }

Index: m4/acinclude.m4
===================================================================
RCS file: /cvsroot/classpath/classpath/m4/acinclude.m4,v
retrieving revision 1.24
diff -u -3 -p -u -r1.24 acinclude.m4
--- m4/acinclude.m4     28 Dec 2007 17:35:35 -0000      1.24
+++ m4/acinclude.m4     3 Jan 2008 00:24:30 -0000
@@ -457,13 +457,12 @@ AC_DEFUN([CLASSPATH_CHECK_JAVAC],
   fi
   dnl Test the given javac
   AC_MSG_CHECKING([if javac is 1.5-capable])
-  cat > conftest.java << EOF
-public class conftest {
-public static void main(String[] args) {
-java.util.List<String> l;
-}}
+  cat > Colour.java << EOF
+public enum Colour {
+RED, ORANGE, YELLOW, GREEN, BLUE, INDIGO, VIOLET;
+}
 EOF
-  $JAVAC -sourcepath '' conftest.java 
+  $JAVAC -sourcepath '' -bootclasspath '' Colour.java 
   javac_result=$?
   if test "x$javac_result" = "x0"; then
     AC_MSG_RESULT([yes])
@@ -471,7 +470,7 @@ EOF
     AC_MSG_WARN([1.5 capable javac required])
   fi
   AC_MSG_CHECKING([whether javac supports -J])
-  $JAVAC -J-Xmx512M -sourcepath '' conftest.java
+  $JAVAC -J-Xmx512M -sourcepath '' -bootclasspath '' Colour.java
   javac_result=$?
   if test "x$javac_result" = "x0"; then
     AC_MSG_RESULT([yes])




----- End forwarded message -----

-- 
Andrew :-)

Escape the Java Trap with GNU Classpath!
http://www.gnu.org/philosophy/java-trap.html
public class gcj extends Freedom implements Java { ... }

Attachment: signature.asc
Description: Digital signature

Reply via email to