diff --git a/Examples/perl5/check.list b/Examples/perl5/check.list
index c7225183a..b33c1cc60 100644
--- a/Examples/perl5/check.list
+++ b/Examples/perl5/check.list
@@ -4,6 +4,7 @@ constants
 constants2
 funcptr
 import
+java
 mpointer
 multimap
 multiple_inheritance
diff --git a/Examples/python/check.list b/Examples/python/check.list
index bc0303a04..add3a8a6d 100644
--- a/Examples/python/check.list
+++ b/Examples/python/check.list
@@ -12,6 +12,7 @@ funcptr2
 functor
 import
 import_template
+java
 #libffi
 mpointer
 multimap
diff --git a/Examples/ruby/check.list b/Examples/ruby/check.list
index 44e114a0e..8d0a3f9de 100644
--- a/Examples/ruby/check.list
+++ b/Examples/ruby/check.list
@@ -9,6 +9,7 @@ functor
 hashargs
 import
 import_template
+java
 mark_function
 mpointer
 multimap
diff --git a/Examples/tcl/check.list b/Examples/tcl/check.list
index b1e290e7f..a4d48453a 100644
--- a/Examples/tcl/check.list
+++ b/Examples/tcl/check.list
@@ -5,6 +5,7 @@ contract
 enum
 funcptr
 import
+java
 mpointer
 multimap
 operator
diff --git a/configure.in b/configure.in
index 3b65166ae..db3af1434 100644
--- a/configure.in
+++ b/configure.in
@@ -703,8 +703,8 @@ AC_SUBST(PERL5CCFLAGS)
 #----------------------------------------------------------------
 
 AC_ARG_WITH(java, AS_HELP_STRING([--without-java], [Disable Java])
-AS_HELP_STRING([--with-java=path], [Set location of Java executable]),[JAVABIN="$withval"], [JAVABIN=yes])
-AC_ARG_WITH(javac, [  --with-javac=path       Set location of Javac executable],[JAVACBIN="$withval"], [JAVACBIN=])
+AS_HELP_STRING([--with-java=path], [Set location of java executable]),[JAVABIN="$withval"], [JAVABIN=yes])
+AC_ARG_WITH(javac, [  --with-javac=path       Set location of javac executable],[JAVACBIN="$withval"], [JAVACBIN=])
 
 # First, check for "--without-java" or "--with-java=no".
 if test x"${JAVABIN}" = xno -o x"${with_alllang}" = xno ; then 
@@ -813,6 +813,34 @@ AC_SUBST(JAVALDSHARED)
 AC_SUBST(JAVACXXSHARED)
 AC_SUBST(JAVACFLAGS)
 
+#----------------------------------------------------------------
+# Look for gcj
+#----------------------------------------------------------------
+
+AC_ARG_WITH(gcj, AS_HELP_STRING([--without-gcj], [Disable GCJ])
+AS_HELP_STRING([--with-gcj=path], [Set location of gcj executable]),[GCJBIN="$withval"], [GCJBIN=yes])
+AC_ARG_WITH(gcjh, [  --with-gcjh=path        Set location of gcjh executable],[GCJHBIN="$withval"], [GCJHBIN=])
+
+# First, check for "--without-gcj" or "--with-gcj=no".
+if test x"${GCJBIN}" = xno -o x"${with_alllang}" = xno ; then 
+  AC_MSG_NOTICE([Disabling GCJ])
+else
+  if test "x$GCJBIN" = xyes; then
+    AC_CHECK_PROGS(GCJ, gcj)
+  else
+    GCJ="$GCJBIN"
+  fi
+
+  if test -z "$GCJCBIN"; then
+    AC_CHECK_PROGS(GCJH, gcjh)
+  else
+    GCJH="$GCJHBIN"
+  fi
+fi
+
+AC_SUBST(GCJ)
+AC_SUBST(GCJH)
+
 #----------------------------------------------------------------
 # Look for Guile
 #----------------------------------------------------------------
@@ -1777,6 +1805,16 @@ if test -z "$ALLEGROCLBIN" ; then
 fi
 AC_SUBST(SKIP_ALLEGROCL)
 
+#----------------------------------------------------------------
+# Additional language dependencies
+#----------------------------------------------------------------
+SKIP_GCJ=
+if test -z "$GCJ" || test -z "$GCJH" ; then
+    SKIP_GCJ="1"
+fi
+AC_SUBST(SKIP_GCJ)
+
+
 #----------------------------------------------------------------
 # Miscellaneous
 #----------------------------------------------------------------