From 82bcd443782738fd163b282497de5501d03f175a Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab@suse.de>
Date: Thu, 25 Aug 2022 09:51:40 +0200
Subject: [PATCH] * configure.ac: Move AC_LANG_PUSH/POP out of AC_CACHE_CHECK. 
 (Bug#57380)

(cherry picked from commit ce82300221f270241fdda1f5dfb567bdb1208543)
---
 configure.ac | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/configure.ac b/configure.ac
index bc7485b81c8..7c98522448b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2047,17 +2047,16 @@ AC_SUBST(NS_OBJ)
 AC_SUBST(NS_OBJC_OBJ)
 
 if test "${HAVE_NS}" = yes; then
+  AC_LANG_PUSH([Objective C])
   AC_CACHE_CHECK(
     [if the Objective C compiler supports instancetype],
     [emacs_cv_objc_instancetype],
-    [AC_LANG_PUSH([Objective C])
-     AC_COMPILE_IFELSE(
+    [AC_COMPILE_IFELSE(
        [AC_LANG_SOURCE([[@interface Test
                           + (instancetype)test;
                           @end]])],
-       emacs_cv_objc_instancetype=yes,
-       emacs_cv_objc_instancetype=no)
-     AC_LANG_POP([Objective C])])
+       [emacs_cv_objc_instancetype=yes],
+       [emacs_cv_objc_instancetype=no])])
 
   if test x$emacs_cv_objc_instancetype = xyes ; then
     AC_DEFINE(NATIVE_OBJC_INSTANCETYPE, 1,
@@ -2067,16 +2066,15 @@ if test "${HAVE_NS}" = yes; then
   AC_CACHE_CHECK(
     [if the Objective C compiler defaults to C99],
     [emacs_cv_objc_c99],
-    [AC_LANG_PUSH([Objective C])
-     AC_COMPILE_IFELSE(
+    [AC_COMPILE_IFELSE(
        [AC_LANG_PROGRAM([], [[for (int i = 0;;);]])],
-       emacs_cv_objc_c99=yes,
-       emacs_cv_objc_c99=no)
-     AC_LANG_POP([Objective C])])
+       [emacs_cv_objc_c99=yes],
+       [emacs_cv_objc_c99=no])])
 
-   if test x$emacs_cv_objc_c99 = xno ; then
-     GNU_OBJC_CFLAGS="$GNU_OBJC_CFLAGS -std=c99"
-   fi
+  if test x$emacs_cv_objc_c99 = xno ; then
+    GNU_OBJC_CFLAGS="$GNU_OBJC_CFLAGS -std=c99"
+  fi
+  AC_LANG_POP([Objective C])
 fi
 
 HAVE_W32=no
-- 
2.39.2