diff --git a/Modules/Setup.stdlib.in b/Modules/Setup.stdlib.in
index e1a866b86ef5f7..8ab93704765a5c 100644
--- a/Modules/Setup.stdlib.in
+++ b/Modules/Setup.stdlib.in
@@ -40,7 +40,7 @@
 @MODULE__QUEUE_TRUE@_queue _queuemodule.c
 @MODULE__RANDOM_TRUE@_random _randommodule.c
 @MODULE__TYPING_TRUE@_typing _typingmodule.c
-@MODULE__XXSUBINTERPRETERS_TRUE@_xxsubinterpreters __xxsubinterpretersmodule.c
+@MODULE__XXSUBINTERPRETERS_TRUE@_xxsubinterpreters _xxsubinterpretersmodule.c
 @MODULE__ZONEINFO_TRUE@_zoneinfo _zoneinfo.c
 
 # needs libm
diff --git a/configure b/configure
index 9c462ac6ebbd23..dd2e3b8ff4d765 100755
--- a/configure
+++ b/configure
@@ -11141,7 +11141,13 @@ fi
 
 
   LIBNSL_CFLAGS=
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing yp_match" >&5
+  save_CFLAGS=$CFLAGS
+save_CPPFLAGS=$CPPFLAGS
+save_LDFLAGS=$LDFLAGS
+save_LIBS=$LIBS
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing yp_match" >&5
 $as_echo_n "checking for library containing yp_match... " >&6; }
 if ${ac_cv_search_yp_match+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -11199,6 +11205,13 @@ else
   have_nis=no
 fi
 
+
+CFLAGS=$save_CFLAGS
+CPPFLAGS=$save_CPPFLAGS
+LDFLAGS=$save_LDFLAGS
+LIBS=$save_LIBS
+
+
   case $ac_cv_search_yp_match in #(
   no) :
     LIBNSL_LIBS= ;; #(
@@ -11214,7 +11227,13 @@ elif test $pkg_failed = untried; then
 $as_echo "no" >&6; }
 
   LIBNSL_CFLAGS=
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing yp_match" >&5
+  save_CFLAGS=$CFLAGS
+save_CPPFLAGS=$CPPFLAGS
+save_LDFLAGS=$LDFLAGS
+save_LIBS=$LIBS
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing yp_match" >&5
 $as_echo_n "checking for library containing yp_match... " >&6; }
 if ${ac_cv_search_yp_match+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -11272,6 +11291,13 @@ else
   have_nis=no
 fi
 
+
+CFLAGS=$save_CFLAGS
+CPPFLAGS=$save_CPPFLAGS
+LDFLAGS=$save_LDFLAGS
+LIBS=$save_LIBS
+
+
   case $ac_cv_search_yp_match in #(
   no) :
     LIBNSL_LIBS= ;; #(
diff --git a/configure.ac b/configure.ac
index 991df5d0848e01..72f2def9b11af0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3196,7 +3196,9 @@ dnl check for NIS / libnsl dependencies
 dnl libnsl dependencies include tirpc includes and lib
 PKG_CHECK_MODULES([LIBNSL], [libnsl], [have_nis=yes], [
   LIBNSL_CFLAGS=
-  AC_SEARCH_LIBS([yp_match], [nsl], [have_nis=yes], [have_nis=no])
+  WITH_SAVE_ENV([
+    AC_SEARCH_LIBS([yp_match], [nsl], [have_nis=yes], [have_nis=no])
+  ])
   AS_CASE([$ac_cv_search_yp_match],
     [no], [LIBNSL_LIBS=],
     ["none required"], [LIBNSL_LIBS=],