procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* configure.ac: Move AC_LANG_PUSH/POP out of AC_CACHE_CHECK. (Bug#57380)

Browse source 
(cherry picked from commit ce82300221)
This commit is contained in:
Andreas Schwab 2022-08-25 09:51:40 +02:00 • committed by Eli Zaretskii
parent 1dd0a5c5db
commit 82bcd44378
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
configure.ac
View file

@ -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