stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8245041: Fix incorrect output order in configure

Browse Source 
Reviewed-by: erikj
This commit is contained in:
Magnus Ihse Bursie 2020-05-14 19:15:39 +02:00
parent 8c5430972f
commit 014095c4ab
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
make/autoconf/boot-jdk.m4
View File

@ -392,8 +392,9 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK],
JJS="" JJS=""
AC_MSG_NOTICE([Cannot use pandoc without jjs]) AC_MSG_NOTICE([Cannot use pandoc without jjs])
ENABLE_PANDOC=false ENABLE_PANDOC=false
else
AC_MSG_RESULT(ok)
fi fi
AC_MSG_RESULT(ok)
AC_SUBST(JJS) AC_SUBST(JJS)
]) ])
]) ])

5
make/autoconf/lib-tests.m4
View File

@ -77,6 +77,8 @@ AC_DEFUN_ONCE([LIB_TESTS_SETUP_JMH],
AC_MSG_RESULT([no, error]) AC_MSG_RESULT([no, error])
AC_MSG_ERROR([$JMH_HOME does not exist or is not a directory]) AC_MSG_ERROR([$JMH_HOME does not exist or is not a directory])
fi fi
AC_MSG_RESULT([yes, $JMH_HOME])
UTIL_FIXUP_PATH([JMH_HOME]) UTIL_FIXUP_PATH([JMH_HOME])
jar_names="jmh-core jmh-generator-annprocess jopt-simple commons-math3" jar_names="jmh-core jmh-generator-annprocess jopt-simple commons-math3"
@ -84,17 +86,14 @@ AC_DEFUN_ONCE([LIB_TESTS_SETUP_JMH],
found_jar_files=$($ECHO $(ls $JMH_HOME/$jar-*.jar 2> /dev/null)) found_jar_files=$($ECHO $(ls $JMH_HOME/$jar-*.jar 2> /dev/null))
if test "x$found_jar_files" = x; then if test "x$found_jar_files" = x; then
AC_MSG_RESULT([no])
AC_MSG_ERROR([--with-jmh does not contain $jar-*.jar]) AC_MSG_ERROR([--with-jmh does not contain $jar-*.jar])
elif ! test -e "$found_jar_files"; then elif ! test -e "$found_jar_files"; then
AC_MSG_RESULT([no])
AC_MSG_ERROR([--with-jmh contain multiple $jar-*.jar: $found_jar_files]) AC_MSG_ERROR([--with-jmh contain multiple $jar-*.jar: $found_jar_files])
fi fi
found_jar_var_name=found_${jar//-/_} found_jar_var_name=found_${jar//-/_}
eval $found_jar_var_name='"'$found_jar_files'"' eval $found_jar_var_name='"'$found_jar_files'"'
done done
AC_MSG_RESULT([yes])
JMH_CORE_JAR=$found_jmh_core JMH_CORE_JAR=$found_jmh_core
JMH_GENERATOR_JAR=$found_jmh_generator_annprocess JMH_GENERATOR_JAR=$found_jmh_generator_annprocess