From df6d108a35dac9817934a5d9f35a85ba6cc5afbb Mon Sep 17 00:00:00 2001
From: Dana Robinson <43805+derobins@users.noreply.github.com>
Date: Fri, 15 Jul 2022 11:23:17 -0700
Subject: Cherry-pick of Autotools updates from develop (#1885) (#1893)

* Suppress Autoconf "obsolete" warnings in Java checks (#1853)
* Use AC_CHECK_LIB instead of AC_HAVE_LIBRARY for Winsock (#1837)
---
 autogen.sh   | 5 ++++-
 configure.ac | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 4676ee0..7c3cbcf 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -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 16a67ca..976f1c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1348,8 +1348,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])
-- 
cgit v0.12