infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-28 12:09:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

8176467: --with-cacerts-file should fail during configure if file does not exist

Browse Source 
Reviewed-by: erikj
This commit is contained in:
Magnus Ihse Bursie 2017-09-25 10:47:28 +02:00
parent 1490f5ebed
commit ab22e37439
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
make/autoconf/generated-configure.sh
View File

@ -5115,7 +5115,7 @@ VS_SDK_PLATFORM_NAME_2013=
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
DATE_WHEN_GENERATED=1506329089
DATE_WHEN_GENERATED=1506329225
###############################################################################
#
@ -25080,8 +25080,20 @@ if test "${with_cacerts_file+set}" = set; then :
withval=$with_cacerts_file;
fi
if test "x$with_cacerts_file" != x; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cacerts file" >&5
$as_echo_n "checking for cacerts file... " >&6; }
if test "x$with_cacerts_file" == x; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: default" >&5
$as_echo "default" >&6; }
else
CACERTS_FILE=$with_cacerts_file
if test ! -f "$CACERTS_FILE"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: fail" >&5
$as_echo "fail" >&6; }
as_fn_error $? "Specified cacerts file \"$CACERTS_FILE\" does not exist" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CACERTS_FILE" >&5
$as_echo "$CACERTS_FILE" >&6; }
fi

10
make/autoconf/jdk-options.m4
View File

@ -206,8 +206,16 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
# Choose cacerts source file
AC_ARG_WITH(cacerts-file, [AS_HELP_STRING([--with-cacerts-file],
[specify alternative cacerts file])])
if test "x$with_cacerts_file" != x; then
AC_MSG_CHECKING([for cacerts file])
if test "x$with_cacerts_file" == x; then
AC_MSG_RESULT([default])
else
CACERTS_FILE=$with_cacerts_file
if test ! -f "$CACERTS_FILE"; then
AC_MSG_RESULT([fail])
AC_MSG_ERROR([Specified cacerts file "$CACERTS_FILE" does not exist])
fi
AC_MSG_RESULT([$CACERTS_FILE])
fi
AC_SUBST(CACERTS_FILE)