Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JDK-8282700: Properly handle several --without options during configure #7713

Closed
wants to merge 6 commits into from
+18 −13
Closed

JDK-8282700: Properly handle several --without options during configure #7713

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
54bbfae
Initial proper handling of some --without arguments
Mar 5, 2022
c9699eb
Handle remaining options and change critical options to error when --…
Mar 7, 2022
18ec991
Fold --without checks into more compact code
Mar 10, 2022
52dd398
Fix syntax errors
Mar 10, 2022
4eb5c85
MACOSX_BUNDLE_BUILD_VERSION cannot be empty
Mar 10, 2022
4cecda2
Merge remote-tracking branch 'upstream/master' into without
Mar 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions make/autoconf/jdk-version.m4
View file
Original file line number Diff line number Diff line change
@@ -547,11 +547,8 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
[Set the MacOSX Bundle CFBundleVersion field. This key is a machine-readable
string composed of one to three period-separated integers and should represent the
build version. Defaults to the build number.])])
if test "x$with_macosx_bundle_build_version" = xyes; then
if test "x$with_macosx_bundle_build_version" = xyes || test "x$with_macosx_bundle_build_version" = xno; then
AC_MSG_ERROR([--with-macosx-bundle-build-version must have a value])
elif test "x$with_macosx_bundle_build_version" = xno; then
# Interpret --without-* as empty string instead of the literal "no"
MACOSX_BUNDLE_BUILD_VERSION=
elif [ ! [[ $with_macosx_bundle_build_version =~ ^[0-9\.]*$ ]] ]; then
AC_MSG_ERROR([--with-macosx-bundle-build-version contains non numbers and periods: $with_macosx_bundle_build_version])
elif test "x$with_macosx_bundle_build_version" != x; then