Changeset 804 for trunk/configure.ac

Timestamp:

03/08/06 11:35:37 (6 years ago)

Author:

faa59

Message:

Latest MinGW updates

File:

• trunk/configure.ac (modified) (2 diffs)

trunk/configure.ac

@@ -132 +132 @@
         AC_MSG_NOTICE([Java SDK home is $javaroot])
         JAVAINCLUDE="-I$javaroot/include"
-        AC_PATH_PROGS(JAVAC,javac,,[$javaroot/bin:$PATH])
+        AC_PATH_PROGS(JAVAC,gcj javac,,[$javaroot/bin:$PATH])
+        if test `basename "$JAVAC"` = "gcj"; then
+            JAVACFLAGS="-C"     # force creation of .class files
+        fi
         AC_PATH_PROGS(JAVADOC,javadoc,,[$javaroot/bin:$PATH])
         AC_PATH_PROGS(JAR,jar,,[$javaroot/bin:$PATH])
-        AC_PATH_PROGS(JAVA,java,,[$javaroot/bin:$PATH])
-        AC_PATH_PROGS(JAVAH,javah,,[$javaroot/bin:$PATH])
-fi
+        AC_PATH_PROGS(JAVA,gij java,,[$javaroot/bin:$PATH])
+        AC_PATH_PROGS(JAVAH,gcjh javah,,[$javaroot/bin:$PATH])
+fi
+
 
 #AC_ARG_WITH([java], AC_HELP_STRING([--with-java=java compiler], [Specify name of Java compiler]),
@@ -165 +169 @@
 #       JAVAINCLUDE=
 #fi
+AC_SUBST(JAVACFLAGS)
 AC_SUBST(SHARED_LDFLAGS)
 AC_SUBST(JAVAINCLUDE)