Clean up java-target-version indentation etc.

Change-Id: Ia3440508b929b37dd4aa5d045445ca7b73bb85d9

configure.in

@@ -1710,7 +1710,7 @@ AC_ARG_WITH(java,
     [ with_java=java ]
 )
 
-AC_ARG_WITH(java_target_version,
+AC_ARG_WITH(java-target-version,
     AS_HELP_STRING([--with-java-target-version],
         [Generate class files that will work on JVMs with the specified version.
          For example, use --with-java-target-version=1.5 to make sure that the
@@ -5586,19 +5586,18 @@ else
     JAVA_HOME=NO_JAVA_HOME ; export JAVA_HOME
 fi
 
-_java_target_ver="1.5"
 dnl ===================================================================
 dnl Check for target Java bytecode version
 dnl ===================================================================
 if test "$SOLAR_JAVA" != ""; then
     AC_MSG_CHECKING([for target Java bytecode version])
     if test "$JDK" = "gcj" -o "$JDK" = "kaffe"; then
-    AC_MSG_RESULT([default by $JDK])
-    if test -n "$with_java_target_version" -a "$with_java_target_version" != "no"; then
-        AC_MSG_WARN([Value defined by --with-java-target-version is ignored!])
-    fi
-    else
-    if test -n "$with_java_target_version" -a "$with_java_target_version" != "no"; then
+        _java_target_ver="1.5"
+        AC_MSG_RESULT([default by $JDK])
+        if test -n "$with_java_target_version" -a "$with_java_target_version" != "no"; then
+            AC_MSG_WARN([Value defined by --with-java-target-version is ignored!])
+        fi
+    elif test -n "$with_java_target_version" -a "$with_java_target_version" != "no"; then
         _java_target_ver="$with_java_target_version"
         AC_MSG_RESULT([$_java_target_ver])
     elif test $_jdk_ver -gt 10000; then
@@ -5607,7 +5606,6 @@ if test "$SOLAR_JAVA" != ""; then
     else
         AC_MSG_ERROR([Unable to guess Java bytecode version from Java version!])
     fi
-    fi
 
     JAVA_SOURCE_VER="$_java_target_ver"
     JAVA_TARGET_VER="$_java_target_ver"