diff --git a/compile b/compile
index aabc61fa..0817e8d4 100755
--- a/compile
+++ b/compile
@@ -295,6 +295,8 @@ EOF
   cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
   clang-cl | *[/\\]clang-cl | clang-cl.exe | *[/\\]clang-cl.exe | \
   icl | *[/\\]icl | icl.exe | *[/\\]icl.exe | \
+  icx | *[/\\]icx | icx.exe | *[/\\]icx.exe | \
+  ifx | *[/\\]ifx | ifx.exe | *[/\\]ifx.exe | \
   ifort | *[/\\]ifort | ifort.exe | *[/\\]ifort.exe )
     func_cl_wrapper "$@"      # Doesn't return...
     ;;
diff --git a/configure b/configure
index b31f8c20..e93a6953 100755
--- a/configure
+++ b/configure
@@ -3211,7 +3211,7 @@ else case e in #(
   e) enable_msvc=no
      case $build in
        *-mingw* | *-cygwin* | *-msys* )
-         for ac_prog in gcc clang icl cl
+         for ac_prog in gcc clang icx icl cl
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -3259,7 +3259,7 @@ fi
   test -n "$CC" && break
 done
 
-         case "$CC" in *cl ) enable_msvc=yes ;; esac
+         case "$CC" in *cl | *icx ) enable_msvc=yes ;; esac
        ;;
      esac ;;
 esac
@@ -4298,7 +4298,7 @@ fi
 
 
   if test $enable_msvc = yes ; then
-    for ac_prog in icl cl
+    for ac_prog in icx icl cl
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -4362,7 +4362,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
-  for ac_prog in gcc clang cc icc icl cl cc xlc xlc_r pgcc
+  for ac_prog in gcc clang cc icx icc icl cl cc xlc xlc_r pgcc
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -4412,7 +4412,7 @@ fi
 fi
 if test -z "$CC"; then
   ac_ct_CC=$CC
-  for ac_prog in gcc clang cc icc icl cl cc xlc xlc_r pgcc
+  for ac_prog in gcc clang cc icx icc icl cl cc xlc xlc_r pgcc
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -5256,7 +5256,7 @@ fi
 
 
   if test $enable_msvc = yes ; then
-    for ac_prog in icl cl
+    for ac_prog in icx icl cl
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -5324,7 +5324,7 @@ if test -z "$CXX"; then
     CXX=$CCC
   else
     if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++ clang++ c++ pgCC icpc gpp cxx cc++ icl cl FCC KCC RCC xlC_r aCC CC
+  for ac_prog in g++ clang++ c++ pgCC icx icpc gpp cxx cc++ icl cl FCC KCC RCC xlC_r aCC CC
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -5374,7 +5374,7 @@ fi
 fi
 if test -z "$CXX"; then
   ac_ct_CXX=$CXX
-  for ac_prog in g++ clang++ c++ pgCC icpc gpp cxx cc++ icl cl FCC KCC RCC xlC_r aCC CC
+  for ac_prog in g++ clang++ c++ pgCC icx icpc gpp cxx cc++ icl cl FCC KCC RCC xlC_r aCC CC
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -12210,8 +12210,8 @@ fi
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
       case $cc_basename in
-      cl* | icl* | ifort*)
-	# Native MSVC or ICC or IFORT
+      cl* | icl* | ifort* | icx* | ifx*)
+	# Native MSVC or classic or new Intel Compilers
 	hardcode_libdir_flag_spec=' '
 	allow_undefined_flag=unsupported
 	always_export_symbols=yes
@@ -12252,7 +12252,7 @@ fi
           fi'
 	;;
       *)
-	# Assume MSVC and ICC and IFORT wrapper
+	# Assume MSVC and Intel compilers wrapper
 	hardcode_libdir_flag_spec=' '
 	allow_undefined_flag=unsupported
 	# Tell ltmain to make .lib files, not .a files.
@@ -13313,8 +13313,8 @@ cygwin* | mingw* | windows* | pw32* | cegcc*)
     dynamic_linker='Win32 ld.exe'
     ;;
 
-  *,cl* | *,icl* | *,ifort*)
-    # Native MSVC or ICC or IFORT
+  *,cl* | *,icl* | *,ifort* | *,icx* | *,ifx*)
+    # Native MSVC or classic or new Intel Compilers
     libname_spec='$name'
     soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
     library_names_spec='$libname.dll.lib'
@@ -15967,8 +15967,8 @@ fi
 
       cygwin* | mingw* | windows* | pw32* | cegcc*)
 	case $GXX,$cc_basename in
-	,cl* | no,cl* | ,icl* | no,icl* | ,ifort* | no,ifort* )
-	  # Native MSVC or ICC or IFORT
+	,cl* | no,cl* | ,icl* | no,icl* | ,ifort* | no,ifort* | ,icx* | no,icx* | ,ifx* | no,ifx*)
+	  # Native MSVC or classic or new Intel compilers
 	  # hardcode_libdir_flag_spec is actually meaningless, as there is
 	  # no search path for DLLs.
 	  hardcode_libdir_flag_spec_CXX=' '
@@ -17565,7 +17565,7 @@ printf %s "checking whether the $compiler linker ($LD) supports shared libraries
     ;;
   cygwin* | mingw* | windows* | cegcc*)
     case $cc_basename in
-    cl* | icl* | ifort*)
+    cl* | icl* | ifort* | icx* | ifx*)
       exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
       ;;
     *)
@@ -17943,8 +17943,8 @@ cygwin* | mingw* | windows* | pw32* | cegcc*)
     dynamic_linker='Win32 ld.exe'
     ;;
 
-  *,cl* | *,icl* | *,ifort*)
-    # Native MSVC or ICC or IFORT
+  *,cl* | *,icl* | *,ifort* | *,icx* | *,ifx*)
+    # Native MSVC or classic or new Intel Compilers
     libname_spec='$name'
     soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
     library_names_spec='$libname.dll.lib'