diff options
author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2022-07-13 19:13:53 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-13 19:13:53 (GMT) |
commit | d6ff0ff657860972ce76145a963eb631708dd3be (patch) | |
tree | e54359d5fda1670653ef61dae6db90d0af8b8953 | |
parent | 21b8d65c2c53e4c1392ae63d120741914a3467a6 (diff) | |
download | hdf5-d6ff0ff657860972ce76145a963eb631708dd3be.zip hdf5-d6ff0ff657860972ce76145a963eb631708dd3be.tar.gz hdf5-d6ff0ff657860972ce76145a963eb631708dd3be.tar.bz2 |
Cherry-pick of Autotools updates from develop (#1885)
* Suppress Autoconf "obsolete" warnings in Java checks (#1853)
* Use AC_CHECK_LIB instead of AC_HAVE_LIBRARY for Winsock (#1837)
-rwxr-xr-x | autogen.sh | 5 | ||||
-rw-r--r-- | configure.ac | 3 |
2 files changed, 6 insertions, 2 deletions
@@ -236,7 +236,10 @@ ${automake_cmd} || exit 1 echo # AUTOCONF -autoconf_cmd="${HDF5_AUTOCONF} --force" +# The "obsolete" warnings category flags our Java macros as obsolete. +# Since there is no clear way to upgrade them (Java support in the Autotools +# is not great) and they work well enough for now, we suppress those warnings. +autoconf_cmd="${HDF5_AUTOCONF} --force --warnings=no-obsolete" echo "${autoconf_cmd}" if [ "$verbose" = true ] ; then ${HDF5_AUTOCONF} --version diff --git a/configure.ac b/configure.ac index d32fdd5..e3d8971 100644 --- a/configure.ac +++ b/configure.ac @@ -1366,8 +1366,9 @@ case "`uname`" in UNAME_CYGWIN="yes" ;; MINGW*) + # The Winsock library AC_CHECK_HEADERS([io.h winsock2.h sys/timeb.h]) - AC_HAVE_LIBRARY([ws2_32]) + AC_CHECK_LIB([ws2_32], [GetUserName]) ;; *) AC_CHECK_HEADERS([io.h winsock2.h sys/timeb.h]) |