diff options
| author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2023-03-18 04:24:45 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-18 04:24:45 (GMT) |
| commit | 45f13f1de1b6db0fdc34681b4b8046fa46f921ba (patch) | |
| tree | bd13274ee0ca27b22834cf104f98a59726bfd8d3 | |
| parent | 6b8249accb398eaeb9036610c214f4c70e542194 (diff) | |
| download | hdf5-45f13f1de1b6db0fdc34681b4b8046fa46f921ba.zip hdf5-45f13f1de1b6db0fdc34681b4b8046fa46f921ba.tar.gz hdf5-45f13f1de1b6db0fdc34681b4b8046fa46f921ba.tar.bz2 | |
Bring 'default' API value over from develop (#2588)
| -rw-r--r-- | .github/workflows/main.yml | 2 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e3b773b..62050a0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -250,7 +250,7 @@ jobs: mirror_vfd: enable direct_vfd: enable deprec_sym: disable - default_api: v110 + default_api: default szip: yes toolchain: "" generator: "autogen" diff --git a/configure.ac b/configure.ac index c097f26..a74bddc 100644 --- a/configure.ac +++ b/configure.ac @@ -3783,11 +3783,13 @@ esac AC_SUBST([DEFAULT_API_VERSION]) AC_MSG_CHECKING([which version of public symbols to use by default]) AC_ARG_WITH([default-api-version], - [AS_HELP_STRING([--with-default-api-version=(v16|v18|v110)], + [AS_HELP_STRING([--with-default-api-version=(default|v16|v18|v110)], [Specify default release version of public symbols [default=v110]])],, [withval=v110]) +## Allowing "default" allows the GitHub CI to check that we didn't forget +## to change the defaults when creating a new major version if test "X$withval" = "Xv16"; then AC_MSG_RESULT([v16]) DEFAULT_API_VERSION=v16 @@ -3798,7 +3800,7 @@ elif test "X$withval" = "Xv18"; then DEFAULT_API_VERSION=v18 AC_DEFINE([USE_18_API_DEFAULT], [1], [Define using v1.8 public API symbols by default]) -elif test "X$withval" = "Xv110"; then +elif test "X$withval" = "Xv110" -o "X$withval" = "Xdefault"; then AC_MSG_RESULT([v110]) DEFAULT_API_VERSION=v110 AC_DEFINE([USE_110_API_DEFAULT], [1], |