Undo the MingW-specific stuff; Change the compiler test to one which …

…should work with all versions of the MS compiler

src/bundles/md_crds/bundle_info.xml

@@ -19,14 +19,8 @@
 
   <CModule name="_gromacs" usesNumpy="true">
     <IncludeDir>gromacs/xdrfile-1.1.4/include</IncludeDir>
-    <LibraryDir platform="win32">C:\msys64\mingw64\lib</LibraryDir>
-    <LibraryDir platform="win32">C:\msys64\mingw64\lib\gcc\x86_64-w64-mingw32\14.2.0</LibraryDir>
-    <LibraryDir platform="win32">C:\mingw64\x86_64-w64-mingw32\lib</LibraryDir>
-    <LibraryDir platform="win32">C:\mingw64\lib\gcc\x86_64-w64-mingw32\12.2.0</LibraryDir>
     <SourceFile>gromacs/gromacs.cpp</SourceFile>
-    <LinkArgument platform="win32">gromacs/xdrfile-1.1.4/src/.libs/libxdrfile.a</LinkArgument>
-    <LinkArgument platform="win32">libmingwex.a</LinkArgument>
-    <LinkArgument platform="win32">libgcc.a</LinkArgument>
+    <LinkArgument platform="win32">gromacs/xdrfile-1.1.4/src/.libs/libxdrfile.lib</LinkArgument>
     <LinkArgument platform="mac">gromacs/xdrfile-1.1.4/src/.libs/libxdrfile.a</LinkArgument>
     <LinkArgument platform="linux">gromacs/xdrfile-1.1.4/src/.libs/libxdrfile.a</LinkArgument>
   </CModule>

src/bundles/md_crds/gromacs/configure.edited

@@ -5748,7 +5748,7 @@ case "${host_cpu}-${host_os}" in
     # stuff (not gromacs-related) when we are using ia64 assembly.
     # For this reason we disable warnings...
 
-   if $CC -V 2>&1 | grep 'Microsoft Corporation' > /dev/null 2>&1; then
+   if echo $CC | grep -w cl > /dev/null 2>&1; then
      xCFLAGS="-O3 -w"
      xASFLAGS=$xCFLAGS
      ac_cv_c_compiler_gnu="no"
@@ -5959,7 +5959,7 @@ case "${host_cpu}-${host_os}" in
     # stuff (not gromacs-related) when we are using assembly.
     # For this reason we disable warnings...
 
-    if $CC -V 2>&1 | grep 'Microsoft Corporation' > /dev/null 2>&1; then
+    if echo $CC | grep -w cl > /dev/null 2>&1; then
       ac_cv_c_compiler_gnu="no"
       case "${host_cpu}" in
         x86_64)
@@ -21908,7 +21908,7 @@ fi
 ############################################################################
 #
 # Don't add math library for intel compilers
-if $CC -V 2>&1 | grep 'Microsoft Corporation' > /dev/null 2>&1; then
+if echo $CC | grep -w cl > /dev/null 2>&1; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: Using built-in math library with intel compiler" >&5
 $as_echo "$as_me: Using built-in math library with intel compiler" >&6;}
 else