svn commit: r1072425 - /subversion/trunk/build/ac-macros/java.m4

[da...@apache.org]

Author: danielsh
Date: Sat Feb 19 19:27:55 2011
New Revision: 1072425

URL: http://svn.apache.org/viewvc?rev=1072425&view=rev
Log:
Tweak configure's JDK output.

* build/ac-macros/java.m4
  (SVN_FIND_JDK): Fix the AC_MSG_RESULT output, and only output a WARNING if 
    a specific --with-jdk=/path/to/jdk argument was passed.

Modified:
    subversion/trunk/build/ac-macros/java.m4

Modified: subversion/trunk/build/ac-macros/java.m4
URL: http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/java.m4?rev=1072425&r1=1072424&r2=1072425&view=diff
==============================================================================
--- subversion/trunk/build/ac-macros/java.m4 (original)
+++ subversion/trunk/build/ac-macros/java.m4 Sat Feb 19 19:27:55 2011
@@ -125,13 +125,19 @@ AC_DEFUN(SVN_FIND_JDK,
     JNI_INCLUDEDIR="$OSX_SDK_JAVA_FRAMEWORK/Headers"
     JDK_SUITABLE=yes
   else
-    AC_MSG_WARN([no JNI header files found.])
-    if test "$os_arch" = "Darwin"; then
-      AC_MSG_WARN([You may need to install the latest Java Development package from http://connect.apple.com/.  Apple no longer includes the JNI header files by default on Java updates.])
-    fi
     JDK_SUITABLE=no
   fi
-  AC_MSG_RESULT([$JNI_INCLUDEDIR/jni.h])
+  if test "$JDK_SUITABLE" = "yes"; then
+    AC_MSG_RESULT([$JNI_INCLUDEDIR/jni.h])
+  else
+    AC_MSG_RESULT([no])
+    if test "$where" != "check"; then
+      AC_MSG_WARN([no JNI header files found.])
+      if test "$os_arch" = "Darwin"; then
+        AC_MSG_WARN([You may need to install the latest Java Development package from http://connect.apple.com/.  Apple no longer includes the JNI header files by default on Java updates.])
+      fi
+    fi
+  fi
 
   if test "$JDK_SUITABLE" = "yes"; then
     JAVA_BIN='$(JDK)/bin'