OpenJDK / jdk / jdk
changeset 59291:1d9325b4b7e9
8245041: Fix incorrect output order in configure
Reviewed-by: erikj
author | ihse |
---|---|
date | Thu, 14 May 2020 19:15:39 +0200 |
parents | d6768149ecb6 |
children | 0afd0e9d6b76 |
files | make/autoconf/boot-jdk.m4 make/autoconf/lib-tests.m4 |
diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/make/autoconf/boot-jdk.m4 Thu May 14 18:56:30 2020 +0200 +++ b/make/autoconf/boot-jdk.m4 Thu May 14 19:15:39 2020 +0200 @@ -392,8 +392,9 @@ JJS="" AC_MSG_NOTICE([Cannot use pandoc without jjs]) ENABLE_PANDOC=false + else + AC_MSG_RESULT(ok) fi - AC_MSG_RESULT(ok) AC_SUBST(JJS) ]) ])
--- a/make/autoconf/lib-tests.m4 Thu May 14 18:56:30 2020 +0200 +++ b/make/autoconf/lib-tests.m4 Thu May 14 19:15:39 2020 +0200 @@ -77,6 +77,8 @@ AC_MSG_RESULT([no, error]) AC_MSG_ERROR([$JMH_HOME does not exist or is not a directory]) fi + AC_MSG_RESULT([yes, $JMH_HOME]) + UTIL_FIXUP_PATH([JMH_HOME]) jar_names="jmh-core jmh-generator-annprocess jopt-simple commons-math3" @@ -84,17 +86,14 @@ found_jar_files=$($ECHO $(ls $JMH_HOME/$jar-*.jar 2> /dev/null)) if test "x$found_jar_files" = x; then - AC_MSG_RESULT([no]) AC_MSG_ERROR([--with-jmh does not contain $jar-*.jar]) elif ! test -e "$found_jar_files"; then - AC_MSG_RESULT([no]) AC_MSG_ERROR([--with-jmh contain multiple $jar-*.jar: $found_jar_files]) fi found_jar_var_name=found_${jar//-/_} eval $found_jar_var_name='"'$found_jar_files'"' done - AC_MSG_RESULT([yes]) JMH_CORE_JAR=$found_jmh_core JMH_GENERATOR_JAR=$found_jmh_generator_annprocess