Fix java config

This commit was SVN r26420.

orte/config/orte_setup_java.m4

@@ -110,15 +110,16 @@ AC_DEFUN([ORTE_SETUP_JAVA],[
             dir=/usr/java
             AS_IF([test "$found" -eq 0 -a -d $dir], 
                   [with_jdk_headers=$dir/include
-                   with_jdk_bindir=$dir/bin])
+                   with_jdk_bindir=$dir/bin
+                   found=1])
 
             # If we think we found them, announce
-            AS_IF([test -n "$with_jdk_headers" -a "$with_jdk_bindir"],
+            AS_IF([test "$found" -eq 1],
                   [AC_MSG_NOTICE([guessing that JDK headers are in $with_jdk_headers])
                    AC_MSG_NOTICE([guessing that JDK javac is in $with_jdk_bindir])])
           ])
 
-   # Find javac and jni.h
+    if test "$found" = "1"; then
         OMPI_CHECK_WITHDIR([jdk-bindir], [$with_jdk_bindir], [javac])
         OMPI_CHECK_WITHDIR([jdk-headers], [$with_jdk_headers], [jni.h])
 
@@ -160,6 +161,10 @@ AC_DEFUN([ORTE_SETUP_JAVA],[
                                [orte_java_happy=no])
                CPPFLAGS=$CPPFLAGS_save
               ])
+    else
+        orte_java_happy=no;
+        HAVE_JAVA_SUPPORT=no;
+    fi
     AC_SUBST(ORTE_JDK_CPPFLAGS)
 
    # Are we happy?